Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

src/renderer/audio/audio.js

@@ -77,6 +77,7 @@ var CiderAudio = {
     spatialOn: function (){
         try{
         CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){}
+        
         CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
         CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.context.destination);
         let roomDimensions = {
@@ -96,12 +97,13 @@ var CiderAudio = {
         CiderAudio.audioNodes.spatialNode.setRoomProperties(roomDimensions, roomMaterials);
         CiderAudio.audioNodes.spatialInput = CiderAudio.audioNodes.spatialNode.createSource();
         CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
+        CiderAudio.hierarchical_loading();
     },
     spatialOff: function (){
         try{
         CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination);
         CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.audioNodes.spatialInput.input);} catch(e){}
-        CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
+        CiderAudio.hierarchical_loading();
     },
     sendAudio: function (){
         var options = {
@@ -123,18 +125,12 @@ var CiderAudio = {
         let LLPW_Q = [5, 1, 3.536, 1.25, 8.409, 1.25, 14.14, 7.071, 5, 0.625, 16.82, 20, 20, 20, 28.28, 28.28, 28.28, 20, 33.64, 33.64, 10, 28.28, 7.071, 3.856];
         let LLPW_GAIN = [0.38, -1.81, -0.23, -0.51, 0.4, 0.84, 0.36, -0.34, 0.27, -1.2, -0.42, -0.67, 0.81, 1.31, -0.71, 0.68, -1.04, 0.79, -0.73, -1.33, 1.17, 0.57, 0.35, 6.33];
         let LLPW_FREQUENCIES = [16.452, 24.636, 37.134, 74.483, 159.54, 308.18, 670.21, 915.81, 1200.7, 2766.4, 2930.6, 4050.6, 4409.1, 5395.2, 5901.6, 6455.5, 7164.1, 7724.1, 8449, 10573, 12368, 14198, 17910, 18916];
-        try {
-            for (var i of CiderAudio.audioNodes.llpw){
-                i.disconnect();
-            }
-        } catch(e){}
-        CiderAudio.audioNodes.llpw = [];
         for (i = 0; i < LLPW_FREQUENCIES.length; i++) {
             CiderAudio.audioNodes.llpw[i] = CiderAudio.context.createBiquadFilter();
             CiderAudio.audioNodes.llpw[i].type = 'peaking'; // 'peaking';
             CiderAudio.audioNodes.llpw[i].frequency.value = LLPW_FREQUENCIES[i];
             CiderAudio.audioNodes.llpw[i].Q.value = LLPW_Q[i];
-            CiderAudio.audioNodes.llpw[i].gain.value = LLPW_GAIN[i] * app.cfg.audio.ciderPPE_value * CiderAudio.audioNodes.llpwEnabled; 
+            CiderAudio.audioNodes.llpw[i].gain.value = LLPW_GAIN[i] * app.cfg.audio.ciderPPE_value; 
         }
 
         for (i = 1; i < LLPW_FREQUENCIES.length; i ++) {
@@ -148,13 +144,6 @@ var CiderAudio = {
         try{
         CiderAudio.audioNodes.llpw[LLPW_FREQUENCIES.length-1].connect(CiderAudio.audioNodes.audioBands[0]);} catch(e){}}
         } 
-        else {
-            try{
-            for (var i of CiderAudio.audioNodes.llpw){
-                i.disconnect();
-            }
-            CiderAudio.audioNodes.llpw = [];} catch(e){}
-        } 
 
     },
     vibrantbass_h2_1: function (status){ 
@@ -162,13 +151,6 @@ var CiderAudio = {
         let VIBRANTBASSBANDS = app.cfg.audio.vibrantBass.frequencies;
         let VIBRANTBASSGAIN = app.cfg.audio.vibrantBass.gain;
         let VIBRANTBASSQ = app.cfg.audio.vibrantBass.Q;
-        try{
-            for (var i of CiderAudio.audioNodes.vibrantbassNode){
-                i.disconnect();
-            }
-        } catch(e){}
-
-        CiderAudio.audioNodes.vibrantbassNode = []; 
          
         for (i = 0; i < VIBRANTBASSBANDS.length; i++) {
             CiderAudio.audioNodes.vibrantbassNode[i] = CiderAudio.context.createBiquadFilter();
@@ -178,8 +160,6 @@ var CiderAudio = {
             CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * app.cfg.audio.vibrantBass.multiplier;
         }
 
-
-
         for (i = 1; i < VIBRANTBASSBANDS.length; i ++) {
             CiderAudio.audioNodes.vibrantbassNode[i-1].connect(CiderAudio.audioNodes.vibrantbassNode[i]);
         }
@@ -187,28 +167,20 @@ var CiderAudio = {
         CiderAudio.audioNodes.vibrantbassNode[VIBRANTBASSBANDS.length-1].connect(CiderAudio.audioNodes.audioBands[0]);
         }
         
-        else {
-            try { 
-                for (var i of CiderAudio.audioNodes.vibrantbassNode){
-                    i.disconnect();
-                }
-                CiderAudio.audioNodes.vibrantbassNode = [];
-            } catch(e){}
-        } 
     },
     hiererchical_unloading: function (){
-        try {
+        try {CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){}
-        CiderAudio.audioNodes.spatialNode.output.disconnect(); CiderAudio.audioNodes.gainNode.disconnect(); 
+        try {CiderAudio.audioNodes.gainNode.disconnect();} catch(e){}
-        for (var i of CiderAudio.audioNodes.llpw){i.disconnect();} 
+        try {for (var i of CiderAudio.audioNodes.llpw){i.disconnect();} CiderAudio.audioNodes.llpw = []} catch(e){}
-        for (var i of CiderAudio.audioNodes.vibrantbassNode){i.disconnect();}
+        try {for (var i of CiderAudio.audioNodes.vibrantbassNode){i.disconnect();} CiderAudio.audioNodes.vibrantbassNode = []} catch(e){}
-    
+
-        } catch(e){}
+        console.log("[Cider][Audio] Finished hierarchical unloading");
         
     },
     hierarchical_loading: function (){ 
         CiderAudio.hiererchical_unloading();
         if (app.cfg.audio.vibrantBass.multiplier !== 0) {  // If vibrant bass is enabled
-            if (CiderAudio.audioNodes.llpwEnabled === 1) { // If CAP & vibrant bass is enabled
+            if (app.cfg.audio.ciderPPE) { // If CAP & vibrant bass is enabled
                 CiderAudio.vibrantbass_h2_1(true)
                 CiderAudio.llpw_h2_2(true, 2)    
                 if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);}
@@ -217,23 +189,23 @@ var CiderAudio = {
         }
             else {                                         // If only vibrant bass is enabled          
                 CiderAudio.vibrantbass_h2_1(true)
-                CiderAudio.llpw_h2_2(false, 0)
+                //CiderAudio.llpw_h2_2(false, 0)
                 if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.vibrantbassNode[0]);}
                 else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);}
                 console.log("[Cider][Audio] Only vibrant bass is enabled")
             }
         }
         else {                                           // If vibrant bass is disabled
-            if (CiderAudio.audioNodes.llpwEnabled === 1) { // If CAP is enabled & vibrant bass is disabled
+            if (app.cfg.audio.ciderPPE) { // If CAP is enabled & vibrant bass is disabled
-                CiderAudio.vibrantbass_h2_1(false)
+                //CiderAudio.vibrantbass_h2_1(false)
                 CiderAudio.llpw_h2_2(true, 1)
                 if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);}
                 else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);}
                 console.log("[Cider][Audio] CAP is enabled & vibrant bass is disabled")
             }
             else {                                        // If CAP & vibrant bass is disabled
-                CiderAudio.vibrantbass_h2_1(false)
+                //CiderAudio.vibrantbass_h2_1(false)
-                CiderAudio.llpw_h2_2(false, 0)
+                //CiderAudio.llpw_h2_2(false, 0)
                 if (app.cfg.audio.spatial) {CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]);}
                 else {CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);}
                 console.log("[Cider][Audio] CAP & vibrant bass is disabled")