From 00ec349f711d9a1e76a5b590659ec18dab84a1bf Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Mon, 7 Feb 2022 23:06:14 -0800
Subject: [PATCH 1/2] Fix fix fix volume steps

---
 src/renderer/views/app/chrome-top.ejs        | 2 +-
 src/renderer/views/components/fullscreen.ejs | 2 +-
 src/renderer/views/components/miniplayer.ejs | 2 +-
 src/web-remote/views/index.ejs               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index fa2e3012..422fb24c 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -108,7 +108,7 @@
         <div class="app-chrome-item volume display--large">
             <button class="volume-button--small volume" @click="muteButtonPressed()"
                     :class="{'active': this.cfg.audio.volume == 0}"></button>
-            <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" max="cfg.audio.maxVolume"
+            <input type="range" @wheel="volumeWheel" :step="cfg.audio.volumeStep" min="0" :max="cfg.audio.maxVolume"
                    v-model="mk.volume" v-if="typeof mk.volume != 'undefined'" @change="checkMuteChange()">
         </div>
         <div class="app-chrome-item generic">
diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 51093c60..e2c30f33 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -80,7 +80,7 @@
                     <div class="app-chrome-item volume display--large">
                         <div class="input-container">
                         <button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button>
-                        <input type="range" class="slider" @wheel="app.volumeWheel" step="0.01" min="0" :max="$root.cfg.audio.maxVolume" v-model="app.mk.volume"
+                        <input type="range" class="slider" @wheel="app.volumeWheel" :step="app.cfg.audio.volumeStep" min="0" :max="$root.cfg.audio.maxVolume" v-model="app.mk.volume"
                                v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
                         </div>       
                     </div>
diff --git a/src/renderer/views/components/miniplayer.ejs b/src/renderer/views/components/miniplayer.ejs
index 606ea49a..8c268588 100644
--- a/src/renderer/views/components/miniplayer.ejs
+++ b/src/renderer/views/components/miniplayer.ejs
@@ -83,7 +83,7 @@
                 <div class="app-chrome-item volume display--large">
                     <div class="input-container">
                     <button class="volume-button--small volume" @click="app.muteButtonPressed()" :class="{'active': app.cfg.audio.volume == 0}"></button>
-                    <input type="range" class="slider" @wheel="app.volumeWheel" step="0.01" min="0" max="app.cfg.audio.maxVolume" v-model="app.mk.volume"
+                    <input type="range" class="slider" @wheel="app.volumeWheel" :step="app.cfg.audio.volumeStep" min="0" :max="app.cfg.audio.maxVolume" v-model="app.mk.volume"
                            v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
                     </div>       
                 </div>
diff --git a/src/web-remote/views/index.ejs b/src/web-remote/views/index.ejs
index ad46c5a5..46915075 100644
--- a/src/web-remote/views/index.ejs
+++ b/src/web-remote/views/index.ejs
@@ -172,7 +172,7 @@
                                     <div class="player-volume-glyph decrease"></div>
                                 </div>
                                 <div class="col">
-                                    <input type="range" class="web-slider volume-slider" max="cfg.audio.maxVolume" min="0" step="0.01"
+                                    <input type="range" class="web-slider volume-slider" max="1" min="0" step="0.01"
                                         @input="setVolume($event.target.value)" :value="player.currentMediaItem.volume">
                                 </div>
                                 <div class="col-auto">

From 0f6fe2c84cd531ba342a90b4dda0c435bc84b658 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Mon, 7 Feb 2022 23:11:59 -0800
Subject: [PATCH 2/2] fix CAP (I think)

---
 src/renderer/audio/audio.js                 | 17 +++++++++--------
 src/renderer/views/components/equalizer.ejs |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index c22ef29c..f195e0c8 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -30,7 +30,7 @@ var CiderAudio = {
         CiderAudio.audioNodes.gainNode.disconnect(); } catch(e){}
         try{ CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){}
         try{
-            CiderAudio.audioNodes.preampNode.disconnect();
+            // CiderAudio.audioNodes.preampNode.disconnect();
             for (var i of CiderAudio.audioNodes.llpw){
                 i.disconnect();
             }
@@ -146,12 +146,13 @@ var CiderAudio = {
             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.preampNode = CiderAudio.context.createBiquadFilter();
         CiderAudio.audioNodes.preampNode.type = 'highshelf'; 
         CiderAudio.audioNodes.preampNode.frequency.value = 0; // Passthrough
-        if (CiderAudio.audioNodes.llpwEnabled === 1) {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain.concat(CiderAudio.audioNodes.llpw[23].gain.value)));} 
-        else {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain));}
+        CiderAudio.audioNodes.preampNode.gain.value = 0;
+        /** if (CiderAudio.audioNodes.llpwEnabled === 1) {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain.concat(CiderAudio.audioNodes.llpw[23].gain.value)));} 
+        else {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain));}*/
 
         for (i = 0; i < VIBRANTBASSBANDS.length; i++) {
         CiderAudio.audioNodes.vibrantbassNode[i] = CiderAudio.context.createBiquadFilter();
@@ -164,14 +165,14 @@ var CiderAudio = {
         if (app.cfg.audio.spatial) {
             try{
             CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination); } catch(e){}
-            CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.preampNode);
+            CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);
         } else {
             try{
             CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){}
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.preampNode);
+            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
         }
-
-        CiderAudio.audioNodes.preampNode.connect(CiderAudio.audioNodes.llpw[0]);
+         
+        // CiderAudio.audioNodes.preampNode.connect(CiderAudio.audioNodes.llpw[0]);
 
         for (i = 1; i < LLPW_FREQUENCIES.length; i ++) {
             CiderAudio.audioNodes.llpw[i-1].connect(CiderAudio.audioNodes.llpw[i]);
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index 2d4f6f3b..af6b4c85 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -324,8 +324,8 @@
                 }
             },
             changePreamp() { 
-                if (CiderAudio.audioNodes.llpwEnabled === 1) {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain.concat(CiderAudio.audioNodes.llpw[23].gain.value)));} 
-                else {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain));}
+                /** if (CiderAudio.audioNodes.llpwEnabled === 1) {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain.concat(CiderAudio.audioNodes.llpw[23].gain.value)));} 
+                else {CiderAudio.audioNodes.preampNode.gain.value = (-Math.max(...app.cfg.audio.equalizer.gain));} */
             },
             changeGain(i) {
                 CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix