From 0131a1a70adf75f490696cd1c9d7a07ec4bbbd62 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sun, 6 Feb 2022 10:58:30 +0000 Subject: [PATCH] Update to audio quality setting clarity (Translators note i18n README.md) - Changed audio quality setting to match MusicKit audio options (Low -> Standard) - Added descriptions for audio quality options - Audio quality now uses string for setting instead of direct bitrate option. --- src/i18n/README.md | 11 ++++++++++- src/i18n/en_US.jsonc | 10 +++++----- src/main/base/store.ts | 2 +- src/renderer/index.js | 20 +++++--------------- src/renderer/views/pages/settings.ejs | 13 ++++++------- 5 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 4e77d616..1f5d47d4 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -55,4 +55,13 @@ Update 05/02/2022 09:00 UTC * `settings.header.audio.quality.lossless`: Added for `en_US`. * `settings.header.audio.quality.lossless.description`: Added for `en_US`. * `settings.option.audio.enableAdvancedFunctionality.ciderPPE`: Added for `en_US`. -* `settings.option.audio.enableAdvancedFunctionality.ciderPPE.description`: Added for `en_US`. \ No newline at end of file +* `settings.option.audio.enableAdvancedFunctionality.ciderPPE.description`: Added for `en_US`. + +Update 06/02/2022 10:35 UTC + +* `settings.header.audio.quality.hireslossless.description`: Brackets removed, handled in renderer. +* `settings.header.audio.quality.lossless.description`: Brackets removed, handled in renderer. +* `settings.header.audio.quality.high.description`: Added for `en_US`. +* `settings.header.audio.quality.auto`: Removed as default for MusicKit is 256. +* `settings.header.audio.quality.standard`: Replaced `settings.header.audio.quality.low` to match MusicKit naming. +* `settings.header.audio.quality.standard.description`: Added for `en_US`. \ No newline at end of file diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 91bc9d14..997dc576 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -222,13 +222,13 @@ "settings.header.audio.description": "Adjust the audio settings for Cider.", "settings.option.audio.quality": "Audio Quality", // Dropdown "settings.header.audio.quality.hireslossless": "Hi-Res Lossless", - "settings.header.audio.quality.hireslossless.description": "(up to 24-bit/192 kHz)", + "settings.header.audio.quality.hireslossless.description": "up to 24-bit/192 kHz", "settings.header.audio.quality.lossless": "Lossless", - "settings.header.audio.quality.lossless.description": "(up to 24-bit/48 kHz)", - "settings.header.audio.quality.enhanced": "Enhanced", + "settings.header.audio.quality.lossless.description": "up to 24-bit/48 kHz", "settings.header.audio.quality.high": "High", - "settings.header.audio.quality.low": "Low", - "settings.header.audio.quality.auto": "Auto", + "settings.header.audio.quality.high.description": "256 kbps", + "settings.header.audio.quality.standard": "Standard", + "settings.header.audio.quality.standard.description": "64 kbps", "settings.option.audio.seamlessTransition": "Seamless Audio Transition", // Toggle "settings.option.audio.enableAdvancedFunctionality": "Enable Advanced Functionality", // Toggle "settings.option.audio.enableAdvancedFunctionality.description": "Enabling AudioContext functionality will allow for extended audio features like Audio Normalization , Equalizers and Visualizers, however on some systems this may cause stuttering in audio tracks.", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index c8ac6280..7a4fd3ae 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -28,7 +28,7 @@ export class Store { "volume": 1, "lastVolume": 1, "muted": false, - "quality": "256", + "quality": "HIGH", "seamless_audio": true, "normalization": false, "ciderPPE": false, diff --git a/src/renderer/index.js b/src/renderer/index.js index 50128982..86dcfa65 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -670,23 +670,13 @@ const app = new Vue({ window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue.items)) }; - // Load saved quality - switch (app.cfg.audio.quality) { - case "extreme": - app.mk.bitrate = app.cfg.audio.quality = 990 - break; - case "high": - app.mk.bitrate = app.cfg.audio.quality = 256 - break; - case "low": - app.mk.bitrate = app.cfg.audio.quality = 64 - break; - default: - // app.mk.bitrate = app.cfg.audio.quality - break; + if (typeof MusicKit.PlaybackBitrate[app.cfg.audio.quality] !== "string") { + app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality] + } else { + app.mk.bitrate = 256 + app.cfg.audio.quality = "HIGH" } - // load last played track try { let lastItem = window.localStorage.getItem("currentTrack") diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 99da6a3d..99272f5c 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -35,11 +35,10 @@
@@ -823,8 +822,8 @@ } }, - changeAudioQuality: function () { - app.mk.bitrate = app.cfg.audio.quality + changeAudioQuality: function () {1 + app.mk.bitrate = MusicKit.PlaybackBitrate[app.cfg.audio.quality]; }, toggleUserInfo: function () { app.chrome.hideUserInfo = !app.cfg.visual.showuserinfo