From a11e5483fccd212ee6ba93d7e6916e23ee8f1773 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Wed, 26 Jan 2022 15:11:55 +0700
Subject: [PATCH] fix eq earrape?

---
 src/main/index.ts                           |  6 +++
 src/renderer/audio/audio.js                 | 57 +++++++++------------
 src/renderer/views/components/equalizer.ejs |  2 +-
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 6862aa18..fff2b36f 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -35,6 +35,12 @@ electron.app.on('ready', () => {
         App.bwCreated(win);
         /// please dont change this for plugins to get proper and fully initialized Win objects
         plug.callPlugins('onReady', win);
+        const reactDevToolsPath = "E:/Cider/build/audion"
+
+         
+        await electron.session.defaultSession.loadExtension(reactDevToolsPath).then(() => {
+            console.log('reads')
+        })
         win.on("ready-to-show", () => {
             win.show();
         });
diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index aa2ebd16..034a7cb8 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -22,8 +22,13 @@ var CiderAudio = {
     },
     off: function(){
         try{
-        CiderAudio.audioNodes.gainNode.disconnect();
-        CiderAudio.audioNodes.spatialNode.disconnect();
+            try{
+        CiderAudio.audioNodes.gainNode.disconnect(); } catch(e){}
+        try{ CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){}
+        try{
+            CiderAudio.audioNodes.audioBands[0].disconnect();
+            CiderAudio.audioNodes.audioBands[9].disconnect();
+        } catch(e){}
         CiderAudio.source.connect(CiderAudio.context.destination);} catch(e){}
     },
     connectContext: function (mediaElem){
@@ -97,41 +102,29 @@ var CiderAudio = {
         let BANDS = app.cfg.audio.equalizer.frequencies;
         let GAIN = app.cfg.audio.equalizer.gain;
         let Q = app.cfg.audio.equalizer.Q;
-        CiderAudio.audioNodes.audioBands = {};
+        CiderAudio.audioNodes.audioBands = [];
 
-        BANDS.forEach((band, i) => {
-        const filter = CiderAudio.context.createBiquadFilter();
 
-        CiderAudio.audioNodes.audioBands[i] = filter;
-
-        if (i === 0) {
-            // The first filter, includes all lower frequencies
-            filter.type = "lowshelf";
-        } else if (i === BANDS.length - 1) {
-            // The last filter, includes all higher frequencies
-            filter.type = "highshelf";
-        } else {
-            filter.type = "peaking";
+        for (i = 0; i < BANDS.length; i++) {
+            CiderAudio.audioNodes.audioBands[i] = CiderAudio.context.createBiquadFilter();
+            CiderAudio.audioNodes.audioBands[i].type = 'peaking'; // 'peaking';
+            CiderAudio.audioNodes.audioBands[i].frequency.value = BANDS[i];
+            CiderAudio.audioNodes.audioBands[i].Q.value = Q[i];
+            CiderAudio.audioNodes.audioBands[i].gain.value = GAIN[i];
         }
-        filter.frequency.value = BANDS[i];
-        filter.gain.value = GAIN[i];
-        filter.Q.value = Q[i];
-        if (i == 0){
-            if (app.cfg.audio.spatial) {
-                CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination);
-                CiderAudio.audioNodes.spatialNode.output.connect(filter);
-            } else {
-                CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);
-                CiderAudio.audioNodes.gainNode.connect(filter);
-            }
-        } else if (i === BANDS.length - 1) {
-            CiderAudio.audioNodes.audioBands[i - 1].connect(filter);
+        if (app.cfg.audio.spatial) {
+            try{
+            CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination); } catch(e){}
+            CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]);
         } else {
-            CiderAudio.audioNodes.audioBands[i - 1].connect(filter);
-            filter.connect(CiderAudio.context.destination);
+            try{
+            CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){}
+            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);
         }
-
-        });
+        for (i = 1; i < BANDS.length; i ++) {
+            CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]);
+        }
+        CiderAudio.audioNodes.audioBands[ BANDS.length-1].connect(CiderAudio.context.destination);
     }
 
 }
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 41cb9843..97211f3d 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -111,7 +111,7 @@
             resetGain(){
                 this.app.cfg.audio.equalizer  = {'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
                 'gain': [0,0,0,0,0,0,0,0,0,0],
-                'Q' :   [1,1,1,1,1,1,1,1,1,1]  }
+                'Q' :   [1,1,1,1,1,1,1,1,1,1]       }
                 for (var  i = 0; i < 10; i++){
                     this.changeGain(i)
                     this.changeFreq(i)