From 2c2bb20eab6555871d43958737eacf1d0eb7e39c Mon Sep 17 00:00:00 2001 From: KaHim Chan <79555466+kyw504100@users.noreply.github.com> Date: Tue, 25 Jan 2022 01:18:14 +0800 Subject: [PATCH 01/46] Update on zh_HK New strings --- src/i18n/zh_HK.jsonc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index 2947fd5d..f9b1e609 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -57,6 +57,7 @@ "term.viewAs": "顯示模式", "term.viewAs.coverArt": "專輯封面", "term.viewAs.list": "列表", + "term.size": "大小", "term.size.normal": "正常", "term.size.compact": "緊凑", "term.enable": "啟用", @@ -64,6 +65,18 @@ "term.enabled": "已啟用", "term.disabled": "已停用", "term.connect": "連結", + "term.confirm": "確認?", + "term.more": "更多", + "term.less": "較少", + "term.showMore": "顯示更多", + "term.showLess": "顯示較少", + "term.topSongs" : "熱門歌曲", + "term.latestReleases": "最新發行", + "term.time.added": "加入於", + "term.time.released": "發行於", + "term.time.updated": "更新於", + "term.fullscreenView": "全螢幕檢視", + "term.defaultView": "一般檢視", // Home "home.title": "主頁", @@ -88,6 +101,7 @@ "action.removeFromQueue.success": "已從播放清單刪除", "action.removeFromQueue.error": "從播放清單刪除的過程中發生錯誤", "action.addToPlaylist": "加至播放列表", + "action.removeFromPlaylist": "從播放列表刪除", "action.addToFavorites": "加至收藏", "action.follow": "追蹤", "action.follow.success": "追蹤中", @@ -95,7 +109,7 @@ "action.unfollow": "取消追蹤", "action.unfollow.success": "已取消追蹤", "action.unfollow.error": "取消追蹤的過程發生錯誤", - "action.playNext": "下一首", + "action.playNext": "插播", "action.playLater": "稍後播放", "action.startRadio": "建立電台", "action.goToArtist": "前往藝人", From b9213324f602c4c01e9a66fb5880f9a530d8c90e Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Tue, 25 Jan 2022 15:11:29 +0800 Subject: [PATCH 02/46] Remove the comma --- src/i18n/zh_HK.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index 3d71573d..ac7b4b7f 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -192,5 +192,5 @@ // Web Remote "remote.web.title": "遙距控制 Cider", - "remote.web.description": "掃描以下的二維碼以控制 Cider", + "remote.web.description": "掃描以下的二維碼以控制 Cider" } From f578f38892b64ffac4d0c7ded79947e60e47e786 Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Tue, 25 Jan 2022 22:06:52 +0800 Subject: [PATCH 03/46] new strings and correction --- src/i18n/zh_HK.jsonc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index b1ff1254..c04cd9e0 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -82,7 +82,7 @@ "term.time.updated": "更新於", "term.fullscreenView": "全螢幕檢視", "term.defaultView": "一般檢視", - "term.spacializedAudioSetting": "音频空间化设置", + "term.spacializedAudioSetting": "空間音訊設定", "term.clearAll": "清空", "term.recentStations": "最近播放的頻道", "term.language": "語言", @@ -98,9 +98,9 @@ "home.followedArtists": "追蹤的藝人", // Errors "error.appleMusicSubRequired": "需要訂閱Apple Music以使用Cider", - "error.connectionError": "There was a problem connecting to Apple Music.", - "error.noResults": "No Results.", - "error.noResults.description": "Try a new search.", + "error.connectionError": "連接至Apple Music伺服器期間發生錯誤。", + "error.noResults": "沒有結果", + "error.noResults.description": "請嘗試新的搜尋內容。", // Actions "action.addToLibrary": "加入資料庫", "action.addToLibrary.success": "成功加入資料庫", From 8e225b590088e3d3d12e8173022d54dbea26679a Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Tue, 25 Jan 2022 22:13:49 +0800 Subject: [PATCH 04/46] Finalize v1 --- src/i18n/zh_HK.jsonc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index c04cd9e0..65acc4ae 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -24,7 +24,7 @@ "term.login": "登入", "term.about": "關於", "term.privateSession": "私人模式", - "term.queue": "播放清單", + "term.queue": "待播清單", "term.search": "搜尋", "term.library": "資料庫", "term.listenNow": "立即聆聽", @@ -98,7 +98,7 @@ "home.followedArtists": "追蹤的藝人", // Errors "error.appleMusicSubRequired": "需要訂閱Apple Music以使用Cider", - "error.connectionError": "連接至Apple Music伺服器期間發生錯誤。", + "error.connectionError": "無法連接到 Apple Music。", "error.noResults": "沒有結果", "error.noResults.description": "請嘗試新的搜尋內容。", // Actions @@ -107,12 +107,12 @@ "action.addToLibrary.error": "加入資料庫的過程發生錯誤", "action.removeFromLibrary": "從資料庫刪除", "action.removeFromLibrary.success": "已從資料庫刪除", - "action.addToQueue": "加入播放清單", - "action.addToQueue.success": "成功加入播放清單", - "action.addToQueue.error": "加入播放清單的過程發生錯誤", - "action.removeFromQueue": "從播放清單刪除", - "action.removeFromQueue.success": "已從播放清單刪除", - "action.removeFromQueue.error": "從播放清單刪除的過程中發生錯誤", + "action.addToQueue": "加入待播清單", + "action.addToQueue.success": "成功加入待播清單", + "action.addToQueue.error": "加入待播清單的過程發生錯誤", + "action.removeFromQueue": "從待播清單刪除", + "action.removeFromQueue.success": "已從待播清單刪除", + "action.removeFromQueue.error": "從待播清單刪除的過程中發生錯誤", "action.addToPlaylist": "加至播放列表", "action.removeFromPlaylist": "從播放列表刪除", "action.addToFavorites": "加至收藏", @@ -208,4 +208,4 @@ // Web Remote "remote.web.title": "遙距控制 Cider", "remote.web.description": "掃描以下的二維碼以控制 Cider" -} +} \ No newline at end of file From 56217be4f7c7c97c22ed037a265a8187af9db5b5 Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Tue, 25 Jan 2022 22:17:55 +0800 Subject: [PATCH 05/46] Correct some typo in zh_tw\ --- src/i18n/zh_TW.jsonc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index 5eefc2be..2c843b37 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -82,7 +82,7 @@ "term.time.updated": "更改于", "term.fullscreenView": "全螢幕顯示", "term.defaultView": "預設顯示", - "term.spacializedAudioSetting": "音频空间化设置", + "term.spacializedAudioSetting": "音頻空間化設置", "term.clearAll": "清空", "term.recentStations": "最近收聽的廣播", "term.language": "語言", @@ -110,9 +110,9 @@ "action.addToQueue": "加入待播清單", "action.addToQueue.success": "成功加入待播清單", "action.addToQueue.error": "加入待播清單的過程發生錯誤", - "action.removeFromQueue": "從代播清單刪除", - "action.removeFromQueue.success": "已從代播清單刪除", - "action.removeFromQueue.error": "從代播清單刪除的過程發生錯誤", + "action.removeFromQueue": "從待播清單刪除", + "action.removeFromQueue.success": "已從待播清單刪除", + "action.removeFromQueue.error": "從待播清單刪除的過程發生錯誤", "action.addToPlaylist": "加入播放列表", "action.removeFromPlaylist": "從播放列表刪除", "action.addToFavorites": "加入我的最愛", From c83fc936cfc2c56c6bab5ff95d0856e920387d9f Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Tue, 25 Jan 2022 22:51:25 +0800 Subject: [PATCH 06/46] More strings for zh_hk --- src/i18n/zh_HK.jsonc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index 65acc4ae..4b69cf55 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -194,6 +194,9 @@ "settings.header.connectivity.discordRPC.appleMusic": "顯示為'Apple Music'", "settings.option.connectivity.discordRPC.clearOnPause": "暫停時清除 Discord 狀態", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 記錄", // Option to Connect + "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延遲 (%)", + "settings.option.connectivity.lastfmScrobble.nowPlaying": "啟用 LastFM 正在播放", + "settings.option.connectivity.lastfmScrobble.removeFeatured": "Remove featuring artists from song title (LastFM)", // Refer to term.connect for the connect button // Settings - Experimental @@ -202,6 +205,25 @@ "settings.option.experimental.compactUI": "緊凑型 UI", // Toggle // Refer to term.disabled & term.enabled + // Spatialization Menu + "spatial.spatialProperties" : "空間音訊屬性", + "spatial.width" : "闊度", + "spatial.height" : "高度", + "spatial.depth" : "深度", + "spatial.roomMaterials" : "空間材質", + "spatial.roomDimensions" : "空間大小", + "spatial.roomPositions" : "空間位置", + "spatial.setDimensions" : "大小設定", + "spatial.setPositions" : "位置設定", + "spatial.up" : "上方", + "spatial.front" : "前方", + "spatial.left" : "左方", + "spatial.right" : "右方", + "spatial.back" : "後方", + "spatial.down" : "下方", + "spatial.listener" : "觀眾", + "spatial.audioSource" : "音源", + // Settings - Unfinished "settings.header.unfinished": "未完成", From 79657fcc40eb3741cf3d7c7ed209e79e3eaf9d58 Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Wed, 26 Jan 2022 00:06:21 +0800 Subject: [PATCH 07/46] Added that 0.001% of the untranslated strings to zh_hk --- src/i18n/zh_HK.jsonc | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index 4b69cf55..edda5930 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -13,6 +13,7 @@ "notification.updatingLibraryAlbums": "正在更新資料庫的專輯...", "notification.updatingLibraryArtists": "正在更新資料庫的藝人...", // Terms + "term.appleInc": "Apple Inc.", "term.appleMusic": "Apple Music", // Follows brand term "term.applePodcasts": "Apple Podcasts", // Follows brand term "term.itunes": "iTunes", // Follows brand term @@ -70,6 +71,9 @@ "term.enabled": "已啟用", "term.disabled": "已停用", "term.connect": "連結", + "term.connecting": "連結中", + "term.disconnect": "取消連結", + "term.authed": "已授權", "term.confirm": "確認?", "term.more": "更多", "term.less": "較少", @@ -86,6 +90,14 @@ "term.clearAll": "清空", "term.recentStations": "最近播放的頻道", "term.language": "語言", + "term.noLyrics": "加載中... / 找不到歌詞。/ 純音樂。", + "term.copyright": "Copyright", + "term.rightsReserved": "保留一切權利。", + "term.sponsor": "贊助這個項目", + "term.ciderTeam": "Cider 團隊", + "term.developer": "開發者", + "term.socialTeam": "社交團隊", + "term.contributors": "貢獻者", // Home "home.title": "主頁", @@ -101,6 +113,17 @@ "error.connectionError": "無法連接到 Apple Music。", "error.noResults": "沒有結果", "error.noResults.description": "請嘗試新的搜尋內容。", + + //Podcasts + "podcast.followOnCider": "在Cider上追蹤", + "podcast.followedOnCider": "已在Cider上追蹤", + "podcast.subscribeOnItunes": "在iTunes上訂閱", + "podcast.subscribedOnItunes": "已在iTunes上訂閱", + "podcast.itunesStore": "iTunes Store", + "podcast.episodes": "單集", + "podcast.playEpisode": "播放單集", + "podcast.website": "Podcast 網頁", + // Actions "action.addToLibrary": "加入資料庫", "action.addToLibrary.success": "成功加入資料庫", @@ -229,5 +252,8 @@ // Web Remote "remote.web.title": "遙距控制 Cider", - "remote.web.description": "掃描以下的二維碼以控制 Cider" + "remote.web.description": "掃描以下的二維碼以控制 Cider", + + //About + "about.thanks": "Major thanks to the Cider Collective Team and all of our contributors." } \ No newline at end of file From 97a00ae14fe50d27756d222f6304543dc32bedd1 Mon Sep 17 00:00:00 2001 From: kyw504100 Date: Wed, 26 Jan 2022 01:42:31 +0800 Subject: [PATCH 08/46] minor update --- src/i18n/zh_HK.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index edda5930..9c057a89 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -255,5 +255,5 @@ "remote.web.description": "掃描以下的二維碼以控制 Cider", //About - "about.thanks": "Major thanks to the Cider Collective Team and all of our contributors." + "about.thanks": "感謝Cider Collective團隊以及所有貢獻者所作出的貢獻。" } \ No newline at end of file From f27c90b6b10e19c38e0d87a20bdf658494738f26 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Wed, 26 Jan 2022 01:01:15 +0200 Subject: [PATCH 09/46] Update Greek Translation (#213) --- src/i18n/el_GR.jsonc | 85 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/src/i18n/el_GR.jsonc b/src/i18n/el_GR.jsonc index 84e1762d..c277c8aa 100644 --- a/src/i18n/el_GR.jsonc +++ b/src/i18n/el_GR.jsonc @@ -1,6 +1,9 @@ { // App info "app.name": "Cider", + + "date.format": "${d} ${m}, ${y}", + // Dialogs "dialog.cancel": "Ακύρωση", "dialog.ok": "ΟΚ", @@ -9,8 +12,8 @@ "notification.updatingLibrarySongs": "Ενημέρωση βιβλιοθήκης τραγουδιών...", "notification.updatingLibraryAlbums": "Ενημέρωση βιβλιοθήκης άλμπουμ...", "notification.updatingLibraryArtists": "Ενημέρωση βιβλιοθήκης καλλιτεχνών...", - // Terms + "term.appleInc": "Apple Inc.", "term.appleMusic": "Apple Music", "term.applePodcasts": "Apple Podcasts", "term.itunes": "iTunes", @@ -60,6 +63,7 @@ "term.viewAs": "Προβολή Ως", "term.viewAs.coverArt": "Εξώφυλλο", "term.viewAs.list": "Λίστα", + "term.size": "Μέγεθος", "term.size.normal": "Κανονικό", "term.size.compact": "Συμπαγή", "term.enable": "Ενεργοποίηση", @@ -67,17 +71,58 @@ "term.enabled": "Ενεργοποιημένο", "term.disabled": "Απενεργοποιημένο", "term.connect": "Σύνδεση", + "term.connecting": "Γίνεται Σύνδεση", + "term.disconnect": "Αποσύνδεση", + "term.authed": "Επικυρωμένο", + "term.confirm": "Σίγουρα;", + "term.more": "Περισσότερα", + "term.less": "Λιγότερα", + "term.showMore": "Εμφάνιση περισσότερων", + "term.showLess": "Εμφάνιση λιγότερων", + "term.topSongs" : "Κορυφαία Τραγούδια", + "term.latestReleases": "Τελευταίες Κυκλοφορίες", + "term.time.added": "Προστέθηκε", + "term.time.released": "Κυκλοφόρησε", + "term.time.updated": "Ενημερώθηκε", + "term.fullscreenView": "Πλήρης οθόνη", + "term.defaultView": "Κανονική οθόνη", + "term.spacializedAudioSetting": "Χωρική Ρύθμιση Ήχου", + "term.clearAll": "Εκκαθάριση Όλων", + "term.recentStations": "Πρόσφατοι Σταθμοί", + "term.language": "Γλώσσα", + "term.noLyrics": "Φόρτωση... / Δεν βρέθηκαν στίχοι./ Ορχηστικό.", + "term.copyright": "Copyright", + "term.rightsReserved": "Όλα τα δικαιώματα διατηρούνται.", + "term.sponsor": "Χορήγησε αυτό το έργο", + "term.ciderTeam": "Ομάδα Cider", + "term.developer": "Προγραμματιστής", + "term.socialTeam": "Κοινωνική Ομάδα", + "term.contributors": "Συνεισφέροντες", // Home "home.title": "Αρχική", "home.recentlyPlayed": "Έπαιξαν Πρόσφατα", "home.recentlyAdded": "Πρόσφατες Προσθήκες", "home.artistsFeed": "Ροή των Καλλιτεχνών σου", + "home.artistsFeed.noArtist": "Ακολούθησε μερικούς καλλιτέχνες πρώτα και οι τελευταίες κυκλοφορίες τους θα εμφανίζονται εδώ", "home.madeForYou": "Δημιουργήθηκε Για Εσάς", "home.friendsListeningTo": "Οι Φίλοι σου Ακούν", "home.followedArtists": "Καλλιτέχνες που Ακολουθείτε", // Errors "error.appleMusicSubRequired": "Το Apple Music απαιτεί μια συνδρομή.", + "error.connectionError": "Δεν είναι δυνατή η σύνδεση με το Apple Music.", + "error.noResults": "Κανένα αποτέλεσμα.", + "error.noResults.description": "Δοκιμάστε μια νέα αναζήτηση.", + + //Podcasts + "podcast.followOnCider": "Ακολούθηση στο Cider", + "podcast.followedOnCider": "Ακολουθείτε στο Cider", + "podcast.subscribeOnItunes": "Συνδρομή στο iTunes", + "podcast.subscribedOnItunes": "Συνδρομητής στο iTunes", + "podcast.itunesStore": "iTunes Store", + "podcast.episodes": "Επεισόδια", + "podcast.playEpisode": "Αναπαραγωγή Επεισοδίου", + "podcast.website": "Ιστότοπος Podcast", // Actions "action.addToLibrary": "Προσθήκη στη Βιβλιοθήκη", @@ -92,6 +137,7 @@ "action.removeFromQueue.success": "Αφαιρέθηκε από την Ουρά", "action.removeFromQueue.error": "Σφάλμα Αφαίρεσης από την Ουρά", "action.addToPlaylist": "Προσθήκη σε Λίστα", + "action.removeFromPlaylist": "Αφαίρεση από Λίστα", "action.addToFavorites": "Προσθήκη στα Αγαπημένα", "action.follow": "Ακολούθηση", "action.follow.success": "Ακολουθήθηκε", @@ -112,6 +158,7 @@ "action.dislike": "Δεν μου αρέσει", "action.undoDislike": "Αναίρεση \"Δεν μου αρέσει\"", "action.showWebRemoteQR": "Εμφάνιση Web Remote QR", + // Settings - Audio "settings.header.audio": "Ήχος", "settings.header.audio.description": "Προσαρμογή ρυθμίσεων ήχου για το Cider.", @@ -140,9 +187,11 @@ "settings.header.visual.animatedArtworkQuality.low": "Χαμηλή", "settings.header.visual.animatedArtworkQuality.medium": "Μέτρια", "settings.header.visual.animatedArtworkQuality.high": "Υψηλή", - "settings.header.visual.animatedArtworkQuality.extreme": "Πολύ Υψηλή", + "settings.header.visual.animatedArtworkQuality.veryHigh": "Πολύ Υψηλή", + "settings.header.visual.animatedArtworkQuality.extreme": "Ακραία", "settings.option.visual.animatedWindowBackground": "Κινούμενο Φόντο Παραθύρου", // Toggle "settings.option.visual.hardwareAcceleration": "Επιτάχυνση Υλικού", // Dropdown + "settings.option.visual.hardwareAcceleration.description": "Απαιτεί επανεκκίνηση", "settings.header.visual.hardwareAcceleration.default": "Προεπιλογή", "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", // Refer to term.disabled for the disabled option @@ -168,6 +217,9 @@ "settings.header.connectivity.discordRPC.appleMusic": "Εμφάνιση ως 'Apple Music'", "settings.option.connectivity.discordRPC.clearOnPause": "Εκκαθάριση του Discord Rich Presence στην Παύση", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect + "settings.option.connectivity.lastfmScrobble.delay": "Καθυστέρηση LastFM Scrobble (%)", + "settings.option.connectivity.lastfmScrobble.nowPlaying": "Ενεργοποίηση LastFM \"Now Playing\"", + "settings.option.connectivity.lastfmScrobble.removeFeatured": "Αφαίρεση καλλιτεχνών feature από τον τίτλο του τραγουδιού (LastFM)", // Refer to term.connect for the connect button // Settings - Experimental @@ -176,7 +228,32 @@ "settings.option.experimental.compactUI": "Συμπαγής Διεπαφή", // Toggle // Refer to term.disabled & term.enabled + // Spatialization Menu + "spatial.spatialProperties" : "Χωρικές Ιδιότητες", + "spatial.width" : "Πλάτος", + "spatial.height" : "Ύψος", + "spatial.depth" : "Βάθος", + "spatial.roomMaterials" : "Υλικά Δωματίου", + "spatial.roomDimensions" : "Διαστάσεις Δωματίου", + "spatial.roomPositions" : "Θέσεις Δωματίου", + "spatial.setDimensions" : "Ορισμός Διαστάσεων", + "spatial.setPositions" : "Ορισμός Θέσεων", + "spatial.up" : "Πάνω", + "spatial.front" : "Πρόσοψη", + "spatial.left" : "Αριστερά", + "spatial.right" : "Δεξιά", + "spatial.back" : "Πίσω Όψη", + "spatial.down" : "Κάτω", + "spatial.listener" : "Ακροατής", + "spatial.audioSource" : "Πηγή Ήχου", + + // Settings - Unfinished + "settings.header.unfinished": "Ημιτελής", + // Web Remote "remote.web.title": "Cider Remote", - "remote.web.description": "Σαρώστε τον κωδικό QR για σύζευξη του Cider με το κινητό σας" -} + "remote.web.description": "Σαρώστε τον κωδικό QR για σύζευξη του Cider με το κινητό σας", + + //About + "about.thanks": "Μεγάλα ευχαριστώ στην Ομάδα Cider Collective και σε όλους τους συνεισφέροντές μας." +} \ No newline at end of file From 07118197c99acff1e023df416cf315b7c34c5458 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 10:48:06 +0700 Subject: [PATCH 10/46] equalizer --- src/i18n/en_US.jsonc | 2 + src/main/base/store.ts | 12 +++ src/renderer/audio/audio.js | 41 +++++++- src/renderer/index.js | 3 +- src/renderer/style.less | 68 ++++++++++++ src/renderer/views/components/equalizer.ejs | 108 ++++++++++++++++++++ src/renderer/views/main.ejs | 10 ++ 7 files changed, 242 insertions(+), 2 deletions(-) create mode 100644 src/renderer/views/components/equalizer.ejs diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index cffdda4a..fa095aff 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -98,6 +98,8 @@ "term.developer": "Developer", "term.socialTeam": "Social Team", "term.contributors": "Contributors", + "term.equalizer": "Equalizer", + "term.reset": "Reset", // Home "home.title": "Home", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index bc495822..cd7fe219 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -49,6 +49,18 @@ export class ConfigStore { "down": 'acoustic-ceiling-tiles', "up": 'acoustic-ceiling-tiles', } + }, + "equalizer": { + '60' : 0, + '170': 0 , + '310': 0 , + '600': 0 , + '1000': 0 , + '3000': 0 , + '6000': 0 , + '12000': 0 , + '14000': 0 , + '16000': 0 , } }, "visual": { diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 64118b7c..6697d908 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -5,6 +5,7 @@ var CiderAudio = { gainNode : null, spatialNode : null, spatialInput: null, + audioBands : null, }, init: function (cb = function () { }) { //AudioOutputs.fInit = true; @@ -42,6 +43,7 @@ var CiderAudio = { if (app.cfg.audio.spatial){ CiderAudio.spatialOn() } + CiderAudio.equalizer() }, normalizerOn: function (){}, normalizerOff: function (){ @@ -49,7 +51,7 @@ var CiderAudio = { }, spatialOn: function (){ try{ - CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);} catch(e){} + CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){} CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.context.destination); let roomDimensions = { @@ -90,6 +92,43 @@ var CiderAudio = { } ); } + }, + equalizer: function (){ + const BANDS = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000]; + CiderAudio.audioNodes.audioBands = {}; + + BANDS.forEach((band, i) => { + const filter = CiderAudio.context.createBiquadFilter(); + + CiderAudio.audioNodes.audioBands[band] = filter; + + if (i === 0) { + // The first filter, includes all lower frequencies + filter.type = "lowshelf"; + } else if (i === BANDS.length - 1) { + // The last filter, includes all higher frequencies + filter.type = "highshelf"; + } else { + filter.type = "peaking"; + } + filter.frequency.value = band; + filter.gain.value = 0; + if (i == 0){ + if (app.cfg.audio.spatial) { + CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination); + CiderAudio.audioNodes.spatialNode.output.connect(filter); + } else { + CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination); + CiderAudio.audioNodes.gainNode.connect(filter); + } + } else if (i === BANDS.length - 1) { + CiderAudio.audioNodes.audioBands[BANDS[i - 1]].connect(filter); + } else { + CiderAudio.audioNodes.audioBands[BANDS[i - 1]].connect(filter); + filter.connect(CiderAudio.context.destination); + } + + }); } } diff --git a/src/renderer/index.js b/src/renderer/index.js index 1c470073..13168409 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -297,7 +297,8 @@ const app = new Vue({ modals: { addToPlaylist: false, spatialProperties: false, - qrcode: false + qrcode: false, + equalizer: false, }, socialBadges: { badgeMap: {}, diff --git a/src/renderer/style.less b/src/renderer/style.less index 8ceefcb2..934c1330 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -5699,4 +5699,72 @@ body.no-gpu { overflow-y: hidden; } +.equalizer-panel { + .modal-window { + height: 300px; + max-height: 300px; + width: 400px; + max-width: 400px; + overflow: hidden; + + .info-header { + padding-left: 12px; + } + + .visual-container { + display: flex; + justify-content: center; + align-items: center; + overflow: hidden; + } + + + .modal-header { + padding: 16px; + position: relative; + overflow: hidden; + + .modal-title { + text-align: center; + } + + .close-btn { + width: 50px; + height: 100%; + background-image: var(--gfx-closeBtn); + background-position: center; + background-repeat: no-repeat; + -webkit-app-region: no-drag; + appearance: none; + border: 0; + background-color: transparent; + position: absolute; + top: 0; + right: 0; + + &:hover { + background-color: rgb(196, 43, 28) + } + } + } + .modal-content{ + display: block; + .input-container{ + display: inline-grid; + width: 35px; + justify-items: center; + font-size: 0.7em; + } + .reset-button{ + width: 50%; + margin-left: 25%; + } + } + } +} +input.eq-slider { + -webkit-appearance: slider-vertical; + width: 5%; +} + @import url("less/compact.less"); diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs new file mode 100644 index 00000000..5ae27962 --- /dev/null +++ b/src/renderer/views/components/equalizer.ejs @@ -0,0 +1,108 @@ + + + \ No newline at end of file diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 5337cb17..5b2f56dd 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -264,6 +264,10 @@ +
@@ -224,16 +224,16 @@ Results
@@ -243,7 +243,7 @@
- Search by song, album, artist, or lyrics. + {{this.$root.getLz('term.search')}}
@@ -256,7 +256,7 @@
@@ -216,7 +216,7 @@ :class="searchTypeClass('applemusic')" style="width:100%;">Apple Music
@@ -224,16 +224,16 @@ Results
@@ -243,7 +243,7 @@
- {{this.$root.getLz('term.search')}} + Search by song, album, artist, or lyrics.
@@ -256,7 +256,7 @@