From 47739f49c409ec9499ab545abe93c7335a0a0b3a Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 19:41:34 -0800
Subject: [PATCH 01/10] Equalizer Presets

---
 src/renderer/audio/audio.js                 |   1 -
 src/renderer/views/components/equalizer.ejs | 150 +++++++++++++++++++-
 2 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 79851511..948a4d7a 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -106,7 +106,6 @@ var CiderAudio = {
         let Q = app.cfg.audio.equalizer.Q;
         CiderAudio.audioNodes.audioBands = [];
 
-
         for (i = 0; i < BANDS.length; i++) {
             CiderAudio.audioNodes.audioBands[i] = CiderAudio.context.createBiquadFilter();
             CiderAudio.audioNodes.audioBands[i].type = 'peaking'; // 'peaking';
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index ee20e848..43016bec 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -4,6 +4,21 @@
             <div class="modal-header">
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
+                <div class="md-option-segment md-option-segment_auto">
+                    <select class="md-select" style="width:110px;text-align:center;margin-right:195pt" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                        <option value="default">Default</option>
+                        <option value="boostBrightness">Boost Brightness</option>
+                        <option value="warmth">Warmth</option>
+                        <option value="acoustic">Acoustic</option>
+                        <option value="clearVocal">Clear Vocal</option>
+                        <option value="pop">Pop</option>
+                        <option value="instrumentClarity">Instrument Clarity</option>    
+                        <option value="smileyFace">Smiley Face</option>
+                        <option value="reduceHarshness">Reduce Harshness</option>
+                        <option value="tightPerc">Tight Percussion</option>
+                        <option value="Maikiwi">Maikiwi Personal</option>
+                    </select>
+                </div>
             </div>
             <div class="modal-content">
                 <!-- BANDS = [60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000]; -->
@@ -139,7 +154,138 @@
                     this.changeFreq(i)
                     this.changeQ(i)
                 }
-            }
+            },
+           
+            changePreset(preset) {
+
+                switch (app.cfg.audio.equalizer.preset) {
+
+                    case "default":
+                        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],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                    case "warmth":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [32, 75, 125, 197, 500, 1000, 2000, 3040, 8000, 16000],
+                            'gain': [0, 2.1, 0, 0.8, 0, 0, 0, -1.5, 0, 0],
+                            'Q': [1, 0.7, 1, 1.5, 1, 1, 1, 2, 1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                    case "acoustic":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [32, 75, 125, 220, 700, 1000, 2000, 4000, 10000, 16000],
+                            'gain': [0, -8, 0, -0.1, -3, 0, 0, 0, 4, 0],
+                            'Q': [1, 0.2, 1, 2.0, 1.4, 1, 1, 1, 0.1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                    case "clearVocal":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [20, 63, 125, 250, 400, 1000, 2000, 4000, 8000, 20000],
+                            'gain': [-22, 0, 0, 0, -3, 0, 1.8, 0, 0, 3.5],
+                            'Q': [0.3, 1, 1, 1, 2.0, 1, 0.7, 1, 1, 0.8],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                    case "instrumentClarity":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [20, 63, 155, 250, 500, 1000, 2000, 5000, 11000, 16000],
+                            'gain': [-15, 0, -3, 0, 0, 0, 0, 3.1, 0, 0],
+                            'Q': [0.5, 1, 2, 1, 1, 1, 1, 1.5, 0.1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+                    
+                case "smileyFace":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
+                            'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
+                            'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                case "reduceHarshness":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
+                            'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
+                            'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                case "tightPerc":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
+                            'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
+                            'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+                case "Maikiwi":
+                    this.app.cfg.audio.equalizer = {
+                        'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
+                        'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
+                        'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],
+                        'preamp': 0,
+                        'mix': 1.2,
+                    }
+                    for (var i = 0; i < 10; i++) {
+                        this.changeGain(i)
+                        this.changeFreq(i)
+                        this.changeQ(i)}
+                    break;
+    }
+           
         }
-    });
+    }});
 </script>
\ No newline at end of file

From cf04dc0b3aca457c23902141dd7dcb555c264bf5 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 19:46:01 -0800
Subject: [PATCH 02/10] oops forgot a preset

---
 src/renderer/views/components/equalizer.ejs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 43016bec..add373cc 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,7 +5,7 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:110px;text-align:center;margin-right:195pt" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:110px;text-align:center;margin-right:195pt" :placeholder="Default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>
@@ -174,6 +174,20 @@
                             this.changeQ(i)}
                         break;
 
+                    case "boostBrightness":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [32, 63, 125, 250, 466, 1000, 2000, 4000, 8000, 20000],
+                            'gain': [0, 0, 0, 0, -2, 0, 0, 0, 0, 10],
+                            'Q': [1, 1, 1, 1, 0.6, 1, 1, 1, 1, 0.1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
                     case "warmth":
                         this.app.cfg.audio.equalizer = {
                             'frequencies': [32, 75, 125, 197, 500, 1000, 2000, 3040, 8000, 16000],

From 410fb9bc4d7341e22c7a7567ce45c4a4904b03f5 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 19:49:16 -0800
Subject: [PATCH 03/10] Align the mf selector

---
 src/renderer/views/components/equalizer.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index add373cc..cd342e01 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,7 +5,7 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:110px;text-align:center;margin-right:195pt" :placeholder="Default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:110px;text-align:center;margin-right:16.75em" :placeholder="Default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>

From a78a51ec77a6c3c8cb27a7a495703fb495495321 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 19:51:38 -0800
Subject: [PATCH 04/10] Small typo

---
 src/renderer/views/components/equalizer.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index cd342e01..de320974 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,7 +5,7 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:110px;text-align:center;margin-right:16.75em" :placeholder="Default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:110px;text-align:center;margin-right:16.75em" placeholder="Default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>

From a87a7cc6e9a7f0730539950122d083aea09dfb1d Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 19:54:11 -0800
Subject: [PATCH 05/10] I kept bamboozling myself

---
 src/renderer/views/components/equalizer.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index de320974..392390c1 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,7 +5,7 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:110px;text-align:center;margin-right:16.75em" placeholder="Default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>

From 8b24826f582ab6fe87b759639e1001a89ebbc932 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 20:43:02 -0800
Subject: [PATCH 06/10] vapor said so

---
 src/main/base/store.ts                      |   1 +
 src/renderer/views/components/equalizer.ejs | 122 +++++++-------------
 2 files changed, 40 insertions(+), 83 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index a62ac282..b2d8155b 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -55,6 +55,7 @@ export class ConfigStore {
                 }
             }, 
             "equalizer": {
+                'preset': 'default',
                 '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],
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 392390c1..0c6c021d 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,13 +5,12 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" placeholder="default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>
                         <option value="acoustic">Acoustic</option>
                         <option value="clearVocal">Clear Vocal</option>
-                        <option value="pop">Pop</option>
                         <option value="instrumentClarity">Instrument Clarity</option>    
                         <option value="smileyFace">Smiley Face</option>
                         <option value="reduceHarshness">Reduce Harshness</option>
@@ -156,7 +155,7 @@
                 }
             },
            
-            changePreset(preset) {
+            changePreset() {
 
                 switch (app.cfg.audio.equalizer.preset) {
 
@@ -168,11 +167,6 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
 
                     case "boostBrightness":
                         this.app.cfg.audio.equalizer = {
@@ -182,11 +176,6 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
 
                     case "warmth":
                         this.app.cfg.audio.equalizer = {
@@ -196,11 +185,6 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
 
                     case "acoustic":
                         this.app.cfg.audio.equalizer = {
@@ -210,11 +194,6 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
 
                     case "clearVocal":
                         this.app.cfg.audio.equalizer = {
@@ -224,11 +203,6 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
 
                     case "instrumentClarity":
                         this.app.cfg.audio.equalizer = {
@@ -238,66 +212,48 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
-                    
-                case "smileyFace":
-                        this.app.cfg.audio.equalizer = {
-                            'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
-                            'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
-                            'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
-                            'preamp': 0,
-                            'mix': 1,
-                        }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
+                        
+                    case "smileyFace":
+                            this.app.cfg.audio.equalizer = {
+                                'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
+                                'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
+                                'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
+                                'preamp': 0,
+                                'mix': 1,
+                            }
 
-                case "reduceHarshness":
+                    case "reduceHarshness":
+                            this.app.cfg.audio.equalizer = {
+                                'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
+                                'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
+                                'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
+                                'preamp': 0,
+                                'mix': 1,
+                            }
+            
+                    case "tightPerc":
+                            this.app.cfg.audio.equalizer = {
+                                'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
+                                'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
+                                'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
+                                'preamp': 0,
+                                'mix': 1,
+                            }
+                        
+                    case "Maikiwi":
                         this.app.cfg.audio.equalizer = {
-                            'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
-                            'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
-                            'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
+                            'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
+                            'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
+                            'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],
                             'preamp': 0,
-                            'mix': 1,
+                            'mix': 1.2,
                         }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
-
-                case "tightPerc":
-                        this.app.cfg.audio.equalizer = {
-                            'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
-                            'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
-                            'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
-                            'preamp': 0,
-                            'mix': 1,
-                        }
-                        for (var i = 0; i < 10; i++) {
-                            this.changeGain(i)
-                            this.changeFreq(i)
-                            this.changeQ(i)}
-                        break;
-                case "Maikiwi":
-                    this.app.cfg.audio.equalizer = {
-                        'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
-                        'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
-                        'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],
-                        'preamp': 0,
-                        'mix': 1.2,
-                    }
+                        
                     for (var i = 0; i < 10; i++) {
-                        this.changeGain(i)
-                        this.changeFreq(i)
-                        this.changeQ(i)}
-                    break;
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
     }
            
         }

From c894c12fdcafc99a295fbc41f97e282cbb371fc9 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 20:45:02 -0800
Subject: [PATCH 07/10] Revert "vapor said so"

This reverts commit 8b24826f582ab6fe87b759639e1001a89ebbc932.
---
 src/main/base/store.ts                      |   1 -
 src/renderer/views/components/equalizer.ejs | 124 +++++++++++++-------
 2 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index b2d8155b..a62ac282 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -55,7 +55,6 @@ export class ConfigStore {
                 }
             }, 
             "equalizer": {
-                'preset': 'default',
                 '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],
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 0c6c021d..392390c1 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,12 +5,13 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" placeholder="default" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>
                         <option value="acoustic">Acoustic</option>
                         <option value="clearVocal">Clear Vocal</option>
+                        <option value="pop">Pop</option>
                         <option value="instrumentClarity">Instrument Clarity</option>    
                         <option value="smileyFace">Smiley Face</option>
                         <option value="reduceHarshness">Reduce Harshness</option>
@@ -155,7 +156,7 @@
                 }
             },
            
-            changePreset() {
+            changePreset(preset) {
 
                 switch (app.cfg.audio.equalizer.preset) {
 
@@ -167,6 +168,11 @@
                             'preamp': 0,
                             'mix': 1,
                         }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
 
                     case "boostBrightness":
                         this.app.cfg.audio.equalizer = {
@@ -176,6 +182,11 @@
                             'preamp': 0,
                             'mix': 1,
                         }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
 
                     case "warmth":
                         this.app.cfg.audio.equalizer = {
@@ -185,6 +196,11 @@
                             'preamp': 0,
                             'mix': 1,
                         }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
 
                     case "acoustic":
                         this.app.cfg.audio.equalizer = {
@@ -194,6 +210,11 @@
                             'preamp': 0,
                             'mix': 1,
                         }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
 
                     case "clearVocal":
                         this.app.cfg.audio.equalizer = {
@@ -203,6 +224,11 @@
                             'preamp': 0,
                             'mix': 1,
                         }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
 
                     case "instrumentClarity":
                         this.app.cfg.audio.equalizer = {
@@ -212,48 +238,66 @@
                             'preamp': 0,
                             'mix': 1,
                         }
-                        
-                    case "smileyFace":
-                            this.app.cfg.audio.equalizer = {
-                                'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
-                                'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
-                                'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
-                                'preamp': 0,
-                                'mix': 1,
-                            }
-
-                    case "reduceHarshness":
-                            this.app.cfg.audio.equalizer = {
-                                'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
-                                'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
-                                'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
-                                'preamp': 0,
-                                'mix': 1,
-                            }
-            
-                    case "tightPerc":
-                            this.app.cfg.audio.equalizer = {
-                                'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
-                                'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
-                                'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
-                                'preamp': 0,
-                                'mix': 1,
-                            }
-                        
-                    case "Maikiwi":
-                        this.app.cfg.audio.equalizer = {
-                            'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
-                            'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
-                            'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],
-                            'preamp': 0,
-                            'mix': 1.2,
-                        }
-                        
-                    for (var i = 0; i < 10; i++) {
+                        for (var i = 0; i < 10; i++) {
                             this.changeGain(i)
                             this.changeFreq(i)
                             this.changeQ(i)}
                         break;
+                    
+                case "smileyFace":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
+                            'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
+                            'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                case "reduceHarshness":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
+                            'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
+                            'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+
+                case "tightPerc":
+                        this.app.cfg.audio.equalizer = {
+                            'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
+                            'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
+                            'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
+                            'preamp': 0,
+                            'mix': 1,
+                        }
+                        for (var i = 0; i < 10; i++) {
+                            this.changeGain(i)
+                            this.changeFreq(i)
+                            this.changeQ(i)}
+                        break;
+                case "Maikiwi":
+                    this.app.cfg.audio.equalizer = {
+                        'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
+                        'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
+                        'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],
+                        'preamp': 0,
+                        'mix': 1.2,
+                    }
+                    for (var i = 0; i < 10; i++) {
+                        this.changeGain(i)
+                        this.changeFreq(i)
+                        this.changeQ(i)}
+                    break;
     }
            
         }

From bb84353564bad2a61ba2ee153e3ff0b43726dd78 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 20:51:55 -0800
Subject: [PATCH 08/10] Fixed display issue

---
 src/main/base/store.ts                      |  1 +
 src/renderer/views/components/equalizer.ejs | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index a62ac282..b2f53d9f 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -55,6 +55,7 @@ export class ConfigStore {
                 }
             }, 
             "equalizer": {
+                'preset': "default",
                 '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],
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 392390c1..1bba8519 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -11,7 +11,6 @@
                         <option value="warmth">Warmth</option>
                         <option value="acoustic">Acoustic</option>
                         <option value="clearVocal">Clear Vocal</option>
-                        <option value="pop">Pop</option>
                         <option value="instrumentClarity">Instrument Clarity</option>    
                         <option value="smileyFace">Smiley Face</option>
                         <option value="reduceHarshness">Reduce Harshness</option>
@@ -156,12 +155,13 @@
                 }
             },
            
-            changePreset(preset) {
+            changePreset() {
 
                 switch (app.cfg.audio.equalizer.preset) {
 
                     case "default":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'default',
                             '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],
@@ -176,6 +176,7 @@
 
                     case "boostBrightness":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'boostBrightness',
                             'frequencies': [32, 63, 125, 250, 466, 1000, 2000, 4000, 8000, 20000],
                             'gain': [0, 0, 0, 0, -2, 0, 0, 0, 0, 10],
                             'Q': [1, 1, 1, 1, 0.6, 1, 1, 1, 1, 0.1],
@@ -190,6 +191,7 @@
 
                     case "warmth":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'warmth',
                             'frequencies': [32, 75, 125, 197, 500, 1000, 2000, 3040, 8000, 16000],
                             'gain': [0, 2.1, 0, 0.8, 0, 0, 0, -1.5, 0, 0],
                             'Q': [1, 0.7, 1, 1.5, 1, 1, 1, 2, 1, 1],
@@ -204,6 +206,7 @@
 
                     case "acoustic":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'acoustic',
                             'frequencies': [32, 75, 125, 220, 700, 1000, 2000, 4000, 10000, 16000],
                             'gain': [0, -8, 0, -0.1, -3, 0, 0, 0, 4, 0],
                             'Q': [1, 0.2, 1, 2.0, 1.4, 1, 1, 1, 0.1, 1],
@@ -218,6 +221,7 @@
 
                     case "clearVocal":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'clearVocal',
                             'frequencies': [20, 63, 125, 250, 400, 1000, 2000, 4000, 8000, 20000],
                             'gain': [-22, 0, 0, 0, -3, 0, 1.8, 0, 0, 3.5],
                             'Q': [0.3, 1, 1, 1, 2.0, 1, 0.7, 1, 1, 0.8],
@@ -232,6 +236,7 @@
 
                     case "instrumentClarity":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'instrumentClarity',
                             'frequencies': [20, 63, 155, 250, 500, 1000, 2000, 5000, 11000, 16000],
                             'gain': [-15, 0, -3, 0, 0, 0, 0, 3.1, 0, 0],
                             'Q': [0.5, 1, 2, 1, 1, 1, 1, 1.5, 0.1, 1],
@@ -246,6 +251,7 @@
                     
                 case "smileyFace":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'smileyFace',
                             'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000],
                             'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5],
                             'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2],
@@ -260,6 +266,7 @@
 
                 case "reduceHarshness":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'reduceHarshness',
                             'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000],
                             'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0],
                             'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1],
@@ -274,6 +281,7 @@
 
                 case "tightPerc":
                         this.app.cfg.audio.equalizer = {
+                            'preset': 'tightPerc',
                             'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
                             'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
                             'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
@@ -287,6 +295,7 @@
                         break;
                 case "Maikiwi":
                     this.app.cfg.audio.equalizer = {
+                        'preset': 'Maikiwi',
                         'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
                         'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
                         'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],

From bb7abed6cedbd863966451f52aeacde82dfdd3ba Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 21:00:35 -0800
Subject: [PATCH 09/10] ;)

---
 src/renderer/views/components/equalizer.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 1bba8519..7f2cea63 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,7 +5,7 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()" :title="Curated Presets by @maikirakiwi">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>

From b5667a1252200d314c8a14e326da13cc66971945 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Thu, 27 Jan 2022 21:02:45 -0800
Subject: [PATCH 10/10] Revert ";)"

This reverts commit bb7abed6cedbd863966451f52aeacde82dfdd3ba.
---
 src/renderer/views/components/equalizer.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 7f2cea63..1bba8519 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -5,7 +5,7 @@
                 <div class="modal-title">{{$root.getLz('term.equalizer')}}</div>
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()" :title="Curated Presets by @maikirakiwi">
+                    <select class="md-select" style="width:220px;text-align:center;margin-right:16.75em" v-model="app.cfg.audio.equalizer.preset" v-on:change="changePreset()">
                         <option value="default">Default</option>
                         <option value="boostBrightness">Boost Brightness</option>
                         <option value="warmth">Warmth</option>