diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index f0b092d2..e3b2f6fe 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -230,7 +230,7 @@ var CiderAudio = { hierarchical_unloading: function (){ try {CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){} try {CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){} - try {CiderAudio.audioNodes.gainNode.disconnect();} catch(e){} CiderAudio.audioNodes.gainNode.gain.value = 1; + try {CiderAudio.audioNodes.gainNode.disconnect();} catch(e){} try {for (var i of CiderAudio.audioNodes.analogWarmth){i.disconnect();} CiderAudio.audioNodes.analogWarmth = []} catch(e){} try {for (var i of CiderAudio.audioNodes.llpw){i.disconnect();} CiderAudio.audioNodes.llpw = []} catch(e){} try {for (var i of CiderAudio.audioNodes.vibrantbassNode){i.disconnect();} CiderAudio.audioNodes.vibrantbassNode = []} catch(e){} @@ -240,8 +240,6 @@ var CiderAudio = { }, hierarchical_loading: function (){ CiderAudio.hierarchical_unloading(); - - CiderAudio.audioNodes.gainNode.gain.value = 1; // Vibrant Bass, CAP, Analog Warmth, Spatial if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && @@ -256,15 +254,11 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - - app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 - + app.cfg.audio.normalization = true; console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial') } else { - app.cfg.audio.normalization = true; - + app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial') @@ -285,10 +279,7 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 - console.log('[Cider][Audio] CAP, Analog Warmth, Maikiwi Spatial') } else { @@ -308,10 +299,7 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]); - - app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 - + app.cfg.audio.normalization = true console.log('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial') } else { @@ -345,10 +333,7 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]); - - app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 - + app.cfg.audio.normalization = true; console.log('[Cider][Audio] CAP, Maikiwi Spatial') } else { @@ -367,9 +352,7 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); - app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 - + app.cfg.audio.normalization = true; console.log('[Cider][Audio] Analog Warmth, Maikiwi Spatial') } else { @@ -425,7 +408,6 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); console.log('[Cider][Audio] Vibrant Bass, Maikiwi Spatial') @@ -442,10 +424,12 @@ var CiderAudio = { app.cfg.audio.maikiwiAudio.ciderPPE === false && app.cfg.audio.spatial === false && app.cfg.audio.maikiwiAudio.analogWarmth === false) { + CiderAudio.vibrantbass_h2_1(true) app.cfg.audio.normalization = true; CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); console.log('[Cider][Audio] Vibrant Bass') + } // CAP else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && @@ -473,7 +457,6 @@ var CiderAudio = { if (app.cfg.audio.maikiwiAudio.spatial === true) { app.cfg.audio.normalization = true; - CiderAudio.audioNodes.gainNode.gain.value += 5 CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]); diff --git a/src/renderer/index.js b/src/renderer/index.js index 184c88d5..39b9226d 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -722,11 +722,6 @@ const app = new Vue({ try { CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak))) } catch (e) {} - if (app.cfg.advanced.AudioContext === true) { - if (app.cfg.audio.maikiwiAudio.spatial === true) { - try { CiderAudio.audioNodes.gainNode.gain.value += 5} catch (e) {} - } - } }) ipcRenderer.on('play', function(_event, mode, id) {