Revert experimental vibrant bass and tuned spatial v2

src/renderer/audio/audio.js

@@ -84,7 +84,7 @@ var CiderAudio = {
         if (app.cfg.audio.maikiwiAudio.spatial === true) { 
         CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver();
 
-        fetch('./audio/impulses/CiderSpatial_Conv_v2.wav').then(async (impulseData) => {
+        fetch('./audio/impulses/CiderSpatial_Conv.wav').then(async (impulseData) => {
             let bufferedImpulse = await impulseData.arrayBuffer();
             CiderAudio.audioNodes.spatialNode.buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);    
             
@@ -205,7 +205,6 @@ var CiderAudio = {
     },
     vibrantbass_h2_1: function (status){ 
         if (status === true) { 
-        /* 
         let VIBRANTBASSBANDS = app.cfg.audio.maikiwiAudio.vibrantBass.frequencies;
         let VIBRANTBASSGAIN = app.cfg.audio.maikiwiAudio.vibrantBass.gain;
         let VIBRANTBASSQ = app.cfg.audio.maikiwiAudio.vibrantBass.Q;
@@ -226,66 +225,7 @@ var CiderAudio = {
         CiderAudio.audioNodes.vibrantbassNode[VIBRANTBASSBANDS.length-1].connect(CiderAudio.audioNodes.audioBands[0]);
         }
         
-        */
-
-        CiderAudio.audioNodes.vibrantbassNode = []
-        CiderAudio.audioNodes.vibrantbassNode[0] = CiderAudio.context.createConvolver();
-
-        
-        switch (app.cfg.audio.equalizer.vibrantBass) { 
-            case '10':
-                break;
-            case '9':
-                break;
-            case '8':
-                break;
-            case '7':
-                break;
-            case '6':
-                break;
-            case '5':
-                fetch('./audio/impulses/CB5_Dirac_Trimmed.wav').then(async (impulseData) => {
-                    let bufferedImpulse = await impulseData.arrayBuffer();
-                    CiderAudio.audioNodes.vibrantbassNode[0].buffer = await CiderAudio.context.decodeAudioData(bufferedImpulse);    
-                    
-                });
-                console.log("[Cider][Audio] Vibrant Bass 5");
-                break;
-            case '4':
-                break;
-            case '3':
-                break;
-            case '2':
-                break;
-            case '1':
-                break;
-            case '-1':
-                break;
-            case '-2':
-                break;
-            case '-3':
-                break;
-            case '-4':
-                break;
-            case '-5':
-                break;
-            case '-6':
-                break;
-            case '-7':
-                break;
-            case '-8':
-                break;
-            case '-9':
-                break;
-            case '-10':
-                break;
-            default:
-                break;
-        }
-        CiderAudio.audioNodes.vibrantbassNode[0].normalize = true; 
         CiderAudio.audioNodes.vibrantbassNode[0].connect(CiderAudio.audioNodes.audioBands[0])
-        
-        }
     },
     hierarchical_unloading: function (){
         try {CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){}
@@ -316,15 +256,12 @@ var CiderAudio = {
                 CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
 
                 app.cfg.audio.normalization = true;
-                CiderAudio.audioNodes.gainNode.gain.value += ((15 - app.cfg.audio.equalizer.vibrantBass) * 10)
                 CiderAudio.audioNodes.gainNode.gain.value += 5
                  
-                
                 console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial')
             }
             else {
                 app.cfg.audio.normalization = true;
-                    CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))
                 
                 CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
                 CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]);
@@ -371,13 +308,11 @@ var CiderAudio = {
                 CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
 
                 app.cfg.audio.normalization = true;
-                CiderAudio.audioNodes.gainNode.gain.value += ((15 - app.cfg.audio.equalizer.vibrantBass) * 10)
                 CiderAudio.audioNodes.gainNode.gain.value += 5      
                 
                 console.log('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial')
             }
             else {
-                CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))
                 CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
                 CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);
                 console.log('[Cider][Audio] Vibrant Bass, CAP, Spatial')
@@ -395,8 +330,6 @@ var CiderAudio = {
             CiderAudio.analogWarmth_h2_3(true, 3); 
 
             app.cfg.audio.normalization = true;
-            CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))
-
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
             console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth')
         }
@@ -463,8 +396,6 @@ var CiderAudio = {
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.analogWarmth_h2_3(true, 2); 
             app.cfg.audio.normalization = true;
-            CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))
-
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
             console.log('[Cider][Audio] Vibrant Bass, Analog Warmth')
         }
@@ -479,8 +410,6 @@ var CiderAudio = {
             CiderAudio.llpw_h2_2(true, 2); 
             
             app.cfg.audio.normalization = true;
-            CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))
-
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
             console.log('[Cider][Audio] Vibrant Bass, CAP')
         }
@@ -494,7 +423,6 @@ var CiderAudio = {
             if (app.cfg.audio.maikiwiAudio.spatial === true) {  
 
                 app.cfg.audio.normalization = true;
-                CiderAudio.audioNodes.gainNode.gain.value += ((15 - app.cfg.audio.equalizer.vibrantBass) * 10)
                 CiderAudio.audioNodes.gainNode.gain.value += 5      
                 CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
                 CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
@@ -513,10 +441,7 @@ var CiderAudio = {
             app.cfg.audio.spatial === false &&
             app.cfg.audio.maikiwiAudio.analogWarmth === false) {  
             CiderAudio.vibrantbass_h2_1(true)
-
             app.cfg.audio.normalization = true;
-            CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))
-
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
             console.log('[Cider][Audio] Vibrant Bass')
         }

src/renderer/index.js

@@ -710,11 +710,7 @@ const app = new Vue({
                 } catch (e) {}
                 if (app.cfg.advanced.AudioContext === true) { 
                     if (app.cfg.audio.maikiwiAudio.spatial === true) { 
-                        CiderAudio.audioNodes.gainNode.gain.value += ((15 - app.cfg.audio.equalizer.vibrantBass) * 10)
+                        try { CiderAudio.audioNodes.gainNode.gain.value += 5} catch (e) {}
-                        CiderAudio.audioNodes.gainNode.gain.value += 5
-                    }
-                    else { 
-                        try {CiderAudio.audioNodes.gainNode.gain.value += ((9 - app.cfg.audio.equalizer.vibrantBass))} catch(e) {}
                     }
                 }
             })

src/renderer/views/components/equalizer.ejs

@@ -305,11 +305,10 @@
             changeVibrantBass() {
                 app.cfg.audio.maikiwiAudio.vibrantBass.multiplier = app.cfg.audio.equalizer.vibrantBass / 10
                 CiderAudio.hierarchical_loading();
-                /**
                 if (app.cfg.audio.equalizer.vibrantBass != 0) {
                 for (var i = 0; i < 21; i++) {
                     CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
-                }} */
+                }} 
             },
             changeMix() {
                 for (var i = 0; i < 10; i++) {