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 @@
-
- {{$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 @@
-
+
@@ -1488,21 +1474,6 @@
removeExperiment(flag) {
app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
},
- toggleAudioContext: function () {
- if (app.cfg.advanced.AudioContext === true) {
- if (navigator.hardwareConcurrency < 6) {
- app.confirm(app.getLz("settings.warn.audio.enableAdvancedFunctionality.lowcores"), function (result) {
- if (result) {
- window.location.reload();
- }
- })
- } else {
- window.location.reload()
- }
- } else {
- window.location.reload()
- }
- },
toggleNormalization: function () {
if (app.cfg.audio.normalization) {
CiderAudio.normalizerOn()
diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs
index 9d621ddd..27953a73 100644
--- a/src/renderer/views/pages/audiolabs.ejs
+++ b/src/renderer/views/pages/audiolabs.ejs
@@ -6,15 +6,7 @@
-
-
- {{$root.getLz('settings.warn.audioLab.withoutAF')}}
-
-
- {{$root.getLz('term.settings')}}
-
-
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
@@ -44,7 +36,7 @@
-
+
Cider Opportunistic Correction System
@@ -59,7 +51,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [1]
@@ -84,7 +76,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer')}} [2]
@@ -109,7 +101,7 @@
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization')}}
@@ -139,7 +131,7 @@
-
+
Cider Origami™️ Vocal Enhancer/Remasterer
diff --git a/src/renderer/views/pages/oobe.ejs b/src/renderer/views/pages/oobe.ejs
index 6647e251..db4d30e3 100644
--- a/src/renderer/views/pages/oobe.ejs
+++ b/src/renderer/views/pages/oobe.ejs
@@ -98,19 +98,6 @@
-
- {{getLz('settings.option.audio.enableAdvancedFunctionality')}}
-
- {{getLz('settings.option.audio.enableAdvancedFunctionality.description')}}
-
-
-
-
-
-
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}