diff --git a/src/renderer/main/app.js b/src/renderer/main/app.js index 5698d739..d5a809f7 100644 --- a/src/renderer/main/app.js +++ b/src/renderer/main/app.js @@ -33,11 +33,14 @@ if (app.cfg.advanced.disableLogging === true) { // Mount Vue to #app app.$mount("#app") -// Init CiderAudio -if (app.cfg.advanced.AudioContext === true) { - CiderAudio.init() +// Init CiderAudio and force audiocontext +if (app.cfg.advanced.AudioContext != true) { + app.cfg.advanced.AudioContext = true; + window.location.reload(); } +CiderAudio.init() + // Import gamepad support app.simulateGamepad = simulateGamepad app.spawnMica = spawnMica diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 431fca42..5e59e9be 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1007,8 +1007,8 @@ const app = new Vue({ try {localStorage.setItem("playingBitrate", app.mk.nowPlayingItem.flavor)} catch(e) {} } - if (!app.cfg.audio.normalization && app.cfg.advanced.AudioContext === false) { CiderAudio.hierarchical_loading(); } - + + if (app.cfg.audio.normalization === false) { CiderAudio.hierarchical_loading(); } // Just Reload for Adaptive CAP if norm is off else { // get unencrypted audio previews to get SoundCheck's normalization tag try { @@ -4354,7 +4354,7 @@ const app = new Vue({ "id": "equalizer", "icon": "../views/svg/speaker.svg", "name": app.getLz('term.equalizer'), - "hidden": true, + "hidden": false, "action": function () { app.modals.equalizer = true app.modals.audioSettings = false @@ -4364,7 +4364,7 @@ const app = new Vue({ "id": "audioLab", "icon": "../views/svg/speaker.svg", "name": app.getLz('settings.option.audio.audioLab'), - "hidden": true, + "hidden": false, "action": function () { app.openSettingsPage('audiolabs') } @@ -4372,10 +4372,12 @@ const app = new Vue({ ] } } + /* if (this.cfg.advanced.AudioContext) { menus.normal.items.find(i => i.id === 'audioLab').hidden = false menus.normal.items.find(i => i.id === 'equalizer').hidden = false } + */ if (this.contextExt) { if (this.contextExt.normal) { menus.normal.items = menus.normal.items.concat(this.contextExt.normal) diff --git a/src/renderer/views/app/app-navigation.ejs b/src/renderer/views/app/app-navigation.ejs index 2f072641..7efad7f4 100644 --- a/src/renderer/views/app/app-navigation.ejs +++ b/src/renderer/views/app/app-navigation.ejs @@ -65,7 +65,7 @@ + @click="modals.castMenu = true">
diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs index 3f2d392c..e1000337 100644 --- a/src/renderer/views/components/settings-window.ejs +++ b/src/renderer/views/components/settings-window.ejs @@ -348,20 +348,6 @@
-
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality')}} -
- {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.description')}} -
-
- -
-
-
{{$root.getLz('term.equalizer')}}
@@ -371,7 +357,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization')}} {{app.cfg.audio.equalizer.vibrantBass != 0 || @@ -391,7 +377,7 @@
+ v-show="app.cfg.audio.normalization && app.cfg.audio.advanced">
{{$root.getLz('settings.option.audio.dbspl.display')}}
@@ -419,7 +405,7 @@
- +