From 182e4a0611fe5ec6952ab2ef7cb255fd2793b6c5 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Tue, 15 Feb 2022 19:23:35 -0800
Subject: [PATCH] debug messages and adding switches

---
 src/main/base/store.ts                |  2 +-
 src/renderer/audio/audio.js           | 18 ++++++++++++++----
 src/renderer/views/pages/settings.ejs |  9 ++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 1ed7d9d9..e60b9a82 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -37,7 +37,7 @@ export class Store {
             "ciderPPE": false,
             "ciderPPE_value": 0.5,
             "analogWarmth": false,
-            "analogWarmth_value": 0.75,
+            "analogWarmth_value": 1.25,
             "spatial": false,
             "spatial_properties": {
                 "presets": [],
diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index 9e553123..ac2a6567 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -231,13 +231,14 @@ var CiderAudio = {
         // Vibrant Bass, CAP, Analog Warmth
         if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
             app.cfg.advanced.ciderPPE === true && 
-            app.cfg.audio.spatial === true &&
+            app.cfg.audio.spatial === false &&
             app.cfg.audio.analogWarmth === true) { 
 
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.llpw_h2_2(true, 2); 
             CiderAudio.analogWarmth_h2_3(true, 3); 
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
+            console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth')
         }
         // CAP, Analog Warmth
         else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
@@ -246,8 +247,9 @@ var CiderAudio = {
             app.cfg.audio.analogWarmth === true) { 
 
             CiderAudio.llpw_h2_2(true, 1);
-            CiderAudio.analogWarmth_h2_3(true, 2); 
+            CiderAudio.analogWarmth_h2_3(true, 3); 
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
+            console.log('[Cider][Audio] CAP and Analog Warmth')
         }
          // Vibrant Bass, Analog Warmth
          else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
@@ -258,6 +260,7 @@ var CiderAudio = {
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.analogWarmth_h2_3(true, 2); 
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
+            console.log('[Cider][Audio] Vibrant Bass, Analog Warmth')
         }
 
         // Vibrant Bass, CAP
@@ -269,6 +272,7 @@ var CiderAudio = {
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.llpw_h2_2(true, 2); 
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
+            console.log('[Cider][Audio] Vibrant Bass, CAP')
         }
         // Vibrant Bass, Spatial
         else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
@@ -279,6 +283,7 @@ var CiderAudio = {
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
             CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.log('[Cider][Audio] Vibrant Bass, Spatial')
         }
         // Vibrant Bass
         else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
@@ -287,6 +292,7 @@ var CiderAudio = {
             app.cfg.audio.analogWarmth === false) {  
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+            console.log('[Cider][Audio] Vibrant Bass')
         }
         // CAP
         else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
@@ -295,14 +301,16 @@ var CiderAudio = {
             app.cfg.audio.analogWarmth === false) {  
             CiderAudio.llpw_h2_2(true, 1); 
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
+            console.log('[Cider][Audio] CAP')
         }
         // Analog Warmth
         else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
             app.cfg.advanced.ciderPPE === false && 
             app.cfg.audio.spatial === false &&
             app.cfg.audio.analogWarmth === true) { 
-            CiderAudio.analogWarmth_h2_2(true, 1); 
+            CiderAudio.analogWarmth_h2_3(true, 1); 
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
+            console.log('[Cider][Audio] Analog Warmth')
         }
         // Spatial
         else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
@@ -311,11 +319,13 @@ var CiderAudio = {
             app.cfg.audio.analogWarmth === false){
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
             CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]);
+            console.log('[Cider][Audio] Spatial')
 
         }
         // Nothing
         else {        
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);                                // If CAP & vibrant bass is disabled
+            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);    
+            console.log('[Cider][Audio] Nothing')                            // If CAP & vibrant bass is disabled
         }
 
         console.log("[Cider][Audio] Finished hierarchical loading");
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 5c45d04a..7cae5ba7 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -103,11 +103,14 @@
                         <small>Changes the intensity of the Analog Warmth Module processing.</small>
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
-                        <button class="md-btn" :disabled="app.cfg.audio.analogWarmth_value === 0.75" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1; CiderAudio.hierarchical_loading();">
+                        <button class="md-btn" :disabled="app.cfg.audio.analogWarmth_value === 1.25" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.25; CiderAudio.hierarchical_loading();">
+                            Smooth
+                        </button>
+                        <button class="md-btn" :disabled="app.cfg.audio.analogWarmth_value === 1.5" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.5; CiderAudio.hierarchical_loading();">
                             Warm
                         </button>
-                        <button class="md-btn" style="margin-top: 5px;" :disabled="app.cfg.audio.analogWarmth_value === 1" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.5; CiderAudio.hierarchical_loading();">
-                            Extra Warm
+                        <button class="md-btn" style="margin-top: 5px;" :disabled="app.cfg.audio.analogWarmth_value === 1.75" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.75; CiderAudio.hierarchical_loading();">
+                            Ex. Warm
                         </button>
                     </div>
                 </div>