Innolab Merger (#479)

* Sync I don't commit now is the conflict of tomorrow (#477)

* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* Removed Discord clear on pause

* Linux frame

* fix #459

* Fix

* exposed --songProgressColor and --songProgressBackground

* revert

* Revert "revert"

This reverts commit 24313b53cf.

* ok?

* Revert "ok?"

This reverts commit 9218ccc887.

* ok

* fix adding/remove mvs from library

* Created audio controls menu

* Added start-renderer command for easier testing

* shitty floats shitty shitty

* LastFM can be unique and have its own call

* Revert "LastFM can be unique and have its own call"

This reverts commit d36e1b19f6.

* Revert "Merge branch 'develop' into develop"

This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.

* Revert "Revert "LastFM can be unique and have its own call""

This reverts commit f156083d48.

* Revert "Merge branch 'ciderapp:develop' into develop"

This reverts commit 20fd0c05da, reversing
changes made to 4937e29fcf.

* lastfm changes

* i hate lastfm

like really really
hate
it

* Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 5b360e74fa, reversing
changes made to 548688341d.

* Revert "Revert "Merge remote-tracking branch 'origin/develop' into develop""

This reverts commit 0fb6802ff3.

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

This reverts commit bd3a2b6172, reversing
changes made to 0fb6802ff3.

* volume step i18n

* and git can go in the bin too

* Added OpenAppData button in settings and updated layout/translations

* change in translation README.md

* margin: 0 on song-progress

* fix np navigation on some songs

* enables native linux chrome

* replay wip

* replay, added this year

* fix for library status

* added attributes.playparams.id

* replay banner

* changed colors

* fancy animations

* more fancy

* some changes

* add play button in library-songs page

* fix

* improve drag on topbar

* Generating top genres, made buttons nicer on replay

* changes to replay graphs

* Revert "Merge branch 'innolab' into develop"

This reverts commit b740f76e3c, reversing
changes made to a5746f08fa.

* added force-video to mediaitem-square

* Update zh_TW.jsonc (#468)

Update TW language.

Co-authored-by: Maikiwi <stella@mai.kiwi>

* Update zh_TW.jsonc

* frontend plugins first iteration

* trans prep

* macOS transparency

* fix playlist on listen now

* fix #474

* ok

* back button & media keys improvement

* ok

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: 宥叡 <46503943+jay900604@users.noreply.github.com>

* refactored specialty settings and switch for two spatialization

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: 宥叡 <46503943+jay900604@users.noreply.github.com>

src/main/base/store.ts

@@ -27,17 +27,26 @@ export class Store {
         },
         "audio": {
             "volume": 1,
-            "volumeStep": 0.02,
+            "volumeStep": 0.1,
             "maxVolume": 1,
             "lastVolume": 1,
             "muted": false,
             "quality": "HIGH",
             "seamless_audio": true,
             "normalization": false,
-            "ciderPPE": false,
-            "ciderPPE_value": 0.5,
-            "analogWarmth": false,
-            "analogWarmth_value": 1.25,
+            "maikiwiAudio": {
+                "ciderPPE": false,
+                "ciderPPE_value": 0.5,
+                "analogWarmth": false,
+                "analogWarmth_value": 1.25,
+                "spatial": false,
+                "vibrantBass": { // Hard coded into the app. Don't include any of this config into exporting presets in store.ts
+                    'multiplier': 0,
+                    'frequencies': [17.182, 42.169, 53.763, 112.69, 119.65, 264.59, 336.57, 400.65, 505.48, 612.7, 838.7, 1155.3, 1175.6, 3406.8, 5158.6, 5968.1, 6999.9, 7468.6, 8862.9, 9666, 10109],
+                    'Q': [2.5, 0.388, 5, 5, 2.5, 7.071, 14.14, 10, 7.071, 14.14, 8.409, 0.372, 7.071, 10, 16.82, 7.071, 28.28, 20, 8.409, 40, 40],
+                    'gain': [-0.34, 2.49, 0.23, -0.49, 0.23, -0.12, 0.32, -0.29, 0.33, 0.19, -0.18, -1.27, -0.11, 0.25, -0.18, -0.53, 0.34, 1.32, 1.78, 0.41, -0.28]
+                }
+            },         
             "spatial": false,
             "spatial_properties": {
                 "presets": [],
@@ -68,12 +77,6 @@ export class Store {
                 'presets': [],
                 'userGenerated': false
             },
-            "vibrantBass": { // Hard coded into the app. Don't include any of this config into exporting presets in store.ts
-                'multiplier': 0,
-                'frequencies': [17.182, 42.169, 53.763, 112.69, 119.65, 264.59, 336.57, 400.65, 505.48, 612.7, 838.7, 1155.3, 1175.6, 3406.8, 5158.6, 5968.1, 6999.9, 7468.6, 8862.9, 9666, 10109],
-                'Q': [2.5, 0.388, 5, 5, 2.5, 7.071, 14.14, 10, 7.071, 14.14, 8.409, 0.372, 7.071, 10, 16.82, 7.071, 28.28, 20, 8.409, 40, 40],
-                'gain': [-0.34, 2.49, 0.23, -0.49, 0.23, -0.12, 0.32, -0.29, 0.33, 0.19, -0.18, -1.27, -0.11, 0.25, -0.18, -0.53, 0.34, 1.32, 1.78, 0.41, -0.28]
-            }
         },
         "visual": {
             "theme": "",

src/renderer/audio/audio.js

@@ -81,27 +81,7 @@ var CiderAudio = {
     },
 
     spatialOn: function (){
-        
-          
-        /** 
-        CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
-        CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination);
-        let roomDimensions = {
-            width: 32,
-            height: 12,
-            depth: 32,
-        };
-        let roomMaterials = {
-            // Room wall materials
-            left: 'metal',
-            right: 'metal',
-            front: 'brick-bare',
-            back: 'brick-bare',
-            down: 'acoustic-ceiling-tiles',
-            up: 'acoustic-ceiling-tiles',
-        };
-        CiderAudio.audioNodes.spatialNode.setRoomProperties(roomDimensions, roomMaterials);*/    
-        
+        if (app.cfg.audio.maikiwiAudio.spatial === true) { 
         CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver();
 
         fetch('./audio/CiderSpatial_Conv.wav').then(async (impulseData) => {
@@ -111,6 +91,29 @@ var CiderAudio = {
         });
         CiderAudio.audioNodes.spatialNode.normalize = true;
         CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination);
+        }
+        else {
+            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 = {
+                width: 32,
+                height: 12,
+                depth: 32,
+            };
+            let roomMaterials = {
+                // Room wall materials
+                left: 'metal',
+                right: 'metal',
+                front: 'brick-bare',
+                back: 'brick-bare',
+                down: 'acoustic-ceiling-tiles',
+                up: 'acoustic-ceiling-tiles',
+            };
+            CiderAudio.audioNodes.spatialNode.setRoomProperties(roomDimensions, roomMaterials);
+            CiderAudio.audioNodes.spatialInput = CiderAudio.audioNodes.spatialNode.createSource();
+            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);}
     },
     spatialOff: function (){
         CiderAudio.hierarchical_loading();
@@ -143,7 +146,7 @@ var CiderAudio = {
                 CiderAudio.audioNodes.analogWarmth[i].type = 'peaking'; // 'peaking';
                 CiderAudio.audioNodes.analogWarmth[i].frequency.value = WARMTH_FREQUENCIES[i];
                 CiderAudio.audioNodes.analogWarmth[i].Q.value = WARMTH_Q[i];
-                CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * app.cfg.audio.analogWarmth_value; 
+                CiderAudio.audioNodes.analogWarmth[i].gain.value = WARMTH_GAIN[i] * app.cfg.audio.maikiwiAudio.analogWarmth_value; 
             }
     
             for (i = 1; i < WARMTH_FREQUENCIES.length; i ++) {
@@ -180,7 +183,7 @@ var CiderAudio = {
             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.llpw[i].gain.value = LLPW_GAIN[i] * app.cfg.audio.maikiwiAudio.ciderPPE_value; 
         }
 
         for (i = 1; i < LLPW_FREQUENCIES.length; i ++) {
@@ -202,9 +205,9 @@ var CiderAudio = {
     },
     vibrantbass_h2_1: function (status){ 
         if (status === true) { 
-        let VIBRANTBASSBANDS = app.cfg.audio.vibrantBass.frequencies;
-        let VIBRANTBASSGAIN = app.cfg.audio.vibrantBass.gain;
-        let VIBRANTBASSQ = app.cfg.audio.vibrantBass.Q;
+        let VIBRANTBASSBANDS = app.cfg.audio.maikiwiAudio.vibrantBass.frequencies;
+        let VIBRANTBASSGAIN = app.cfg.audio.maikiwiAudio.vibrantBass.gain;
+        let VIBRANTBASSQ = app.cfg.audio.maikiwiAudio.vibrantBass.Q;
         CiderAudio.audioNodes.vibrantbassNode = []
         
         for (i = 0; i < VIBRANTBASSBANDS.length; i++) {
@@ -212,7 +215,7 @@ var CiderAudio = {
             CiderAudio.audioNodes.vibrantbassNode[i].type = 'peaking'; // 'peaking';
             CiderAudio.audioNodes.vibrantbassNode[i].frequency.value = VIBRANTBASSBANDS[i];
             CiderAudio.audioNodes.vibrantbassNode[i].Q.value = VIBRANTBASSQ[i];
-            CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * app.cfg.audio.vibrantBass.multiplier;
+            CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * app.cfg.audio.maikiwiAudio.vibrantBass.multiplier;
         }
 
         for (i = 1; i < VIBRANTBASSBANDS.length; i ++) {
@@ -224,6 +227,7 @@ var CiderAudio = {
         
     },
     hierarchical_unloading: function (){
+        try {CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){}
         try {CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){}
         try {CiderAudio.audioNodes.gainNode.disconnect();} catch(e){}
         try {for (var i of CiderAudio.audioNodes.analogWarmth){i.disconnect();} CiderAudio.audioNodes.analogWarmth = []} catch(e){}
@@ -237,35 +241,51 @@ var CiderAudio = {
         CiderAudio.hierarchical_unloading();
 
         // Vibrant Bass, CAP, Analog Warmth, Spatial
-        if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
-            app.cfg.advanced.ciderPPE === true && 
+        if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === true &&
-            app.cfg.audio.analogWarmth === true) { 
+            app.cfg.audio.maikiwiAudio.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.spatialNode);
-            CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
-            console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial')
+
+            if (app.cfg.audio.maikiwiAudio.spatial === true) {  
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
+                console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial')
+            }
+            else {
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
+                CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]);
+                console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial')
+            }
         }
         // Vibrant Bass, CAP, Spatial
-        else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
-            app.cfg.advanced.ciderPPE === true && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === true &&
-            app.cfg.audio.analogWarmth === false) { 
+            app.cfg.audio.maikiwiAudio.analogWarmth === false) { 
 
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.llpw_h2_2(true, 2); 
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-            CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
-            console.log('[Cider][Audio] Vibrant Bass, CAP, Spatial')
+            if (app.cfg.audio.maikiwiAudio.spatial === true) {  
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
+                console.log('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial')
+            }
+            else {
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
+                CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);
+                console.log('[Cider][Audio] Vibrant Bass, CAP, Spatial')
+            }
+            
         }
         // Vibrant Bass, CAP, Analog Warmth
-        else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
-            app.cfg.advanced.ciderPPE === true && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === false &&
-            app.cfg.audio.analogWarmth === true) { 
+            app.cfg.audio.maikiwiAudio.analogWarmth === true) { 
 
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.llpw_h2_2(true, 2); 
@@ -274,33 +294,46 @@ var CiderAudio = {
             console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth')
         }
         // CAP, Spatial
-        else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
-            app.cfg.advanced.ciderPPE === true && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === true &&
-            app.cfg.audio.analogWarmth === false) {  
+            app.cfg.audio.maikiwiAudio.analogWarmth === false) {  
 
             CiderAudio.llpw_h2_2(true, 1);
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-            CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
-            console.log('[Cider][Audio] CAP, Spatial')
+            if (app.cfg.audio.maikiwiAudio.spatial === true) {  
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
+                console.log('[Cider][Audio] Maikiwi Spatial')
+            }
+            else {
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
+                CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.llpw[0]);
+                console.log('[Cider][Audio] CAP, Spatial')
+            }
         }
         // Analog Warmth, Spatial
-        else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
-            app.cfg.advanced.ciderPPE === false && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === false && 
             app.cfg.audio.spatial === true &&
-            app.cfg.audio.analogWarmth === true) {  
+            app.cfg.audio.maikiwiAudio.analogWarmth === true) {  
 
-            CCiderAudio.analogWarmth_h2_3(true, 1); 
-            //CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-            CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
-            console.log('[Cider][Audio] Analog Warmth, Spatial')
+            CiderAudio.analogWarmth_h2_3(true, 1); 
+            if (app.cfg.audio.maikiwiAudio.spatial === true) {  
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
+                console.log('[Cider][Audio] Analog Warmth, Maikiwi Spatial')
+            }
+            else {
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
+                CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]);
+                console.log('[Cider][Audio] Analog Warmth, Spatial')
+            }
         }
         // CAP, Analog Warmth
-        else if (app.cfg.audio.vibrantBass.multiplier === 0 && 
-            app.cfg.advanced.ciderPPE === true && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === false &&
-            app.cfg.audio.analogWarmth === true) { 
+            app.cfg.audio.maikiwiAudio.analogWarmth === true) { 
 
             CiderAudio.llpw_h2_2(true, 1);
             CiderAudio.analogWarmth_h2_3(true, 3); 
@@ -308,10 +341,10 @@ var CiderAudio = {
             console.log('[Cider][Audio] CAP and Analog Warmth')
         }
          // Vibrant Bass, Analog Warmth
-         else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
-            app.cfg.advanced.ciderPPE === false && 
+         else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === false && 
             app.cfg.audio.spatial === false &&
-            app.cfg.audio.analogWarmth === true) { 
+            app.cfg.audio.maikiwiAudio.analogWarmth === true) { 
 
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.analogWarmth_h2_3(true, 2); 
@@ -320,10 +353,10 @@ var CiderAudio = {
         }
 
         // Vibrant Bass, CAP
-        else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
-            app.cfg.advanced.ciderPPE === true && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === false &&
-            app.cfg.audio.analogWarmth === false) { 
+            app.cfg.audio.maikiwiAudio.analogWarmth === false) { 
 
             CiderAudio.vibrantbass_h2_1(true)
             CiderAudio.llpw_h2_2(true, 2); 
@@ -331,53 +364,66 @@ var CiderAudio = {
             console.log('[Cider][Audio] Vibrant Bass, CAP')
         }
         // Vibrant Bass, Spatial
-        else if (app.cfg.audio.vibrantBass.multiplier !== 0 && 
-            app.cfg.advanced.ciderPPE === false && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === false && 
             app.cfg.audio.spatial === true &&
-            app.cfg.audio.analogWarmth === false) {  
+            app.cfg.audio.maikiwiAudio.analogWarmth === false) {  
 
             CiderAudio.vibrantbass_h2_1(true)
-            //CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-            CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
-            console.log('[Cider][Audio] Vibrant Bass, Spatial')
+            if (app.cfg.audio.maikiwiAudio.spatial === true) {  
+                CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
+                console.log('[Cider][Audio] Vibrant Bass, Maikiwi Spatial')
+            }
+            else {
+                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 && 
-            app.cfg.advanced.ciderPPE === false && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === false && 
             app.cfg.audio.spatial === false &&
-            app.cfg.audio.analogWarmth === false) {  
+            app.cfg.audio.maikiwiAudio.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 && 
-            app.cfg.advanced.ciderPPE === true && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === true && 
             app.cfg.audio.spatial === false &&
-            app.cfg.audio.analogWarmth === false) {  
+            app.cfg.audio.maikiwiAudio.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) { 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === false && 
+            app.cfg.audio.maikiwiAudio.spatial === false &&
+            app.cfg.audio.maikiwiAudio.analogWarmth === true) { 
             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 && 
-            app.cfg.advanced.ciderPPE === false && 
+        else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && 
+            app.cfg.audio.maikiwiAudio.ciderPPE === false && 
             app.cfg.audio.spatial === true &&
-            app.cfg.audio.analogWarmth === false){
-            //CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
-            CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
-            CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]);
-            console.log('[Cider][Audio] Spatial')
+            app.cfg.audio.maikiwiAudio.analogWarmth === false){
+                if (app.cfg.audio.maikiwiAudio.spatial === true) {  
+                    CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
+                    CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]);
+                    console.log('[Cider][Audio] Maikiwi Spatial')
+                }
+                else {
+                    CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
+                    CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]);
+                    console.log('[Cider][Audio] Spatial')
+                }
 
         }
         // Nothing

src/renderer/views/app/chrome-top.ejs

@@ -57,7 +57,7 @@
                                  v-if="mk.nowPlayingItem['attributes']['contentRating'] == 'explicit'"
                                  style="display: inline-block"></div>
                         </div>
-                        <div class="audio-type ppe-icon" v-if="cfg.advanced.ciderPPE === true"></div>
+                        <div class="audio-type ppe-icon" v-if="cfg.audio.maikiwiAudio.ciderPPE === true"></div>
                         <div class="song-artist-album">
                             <div class="song-artist-album-content"
                                  :class="[isElementOverflowing('#app-main > .app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album > .song-artist-album-content') ? 'marquee' : '']"

src/renderer/views/components/audio-settings.ejs

@@ -44,7 +44,7 @@
                 app.modals.audioSettings = false
             },
             openSpatialAudio() {
-                if(app.cfg.audio.spatial) {
+                if(app.cfg.audio.spatial === true && app.cfg.audio.maikiwiAudio.spatial === false) {
                     app.modals.spatialProperties = true
                     app.modals.audioSettings = false
                 } else {

src/renderer/views/components/equalizer.ejs

@@ -303,11 +303,11 @@
                 app.resetState()
             },
             changeVibrantBass() {
-                app.cfg.audio.vibrantBass.multiplier = app.cfg.audio.equalizer.vibrantBass / 10
+                app.cfg.audio.maikiwiAudio.vibrantBass.multiplier = app.cfg.audio.equalizer.vibrantBass / 10
                 CiderAudio.hierarchical_loading();
                 if (app.cfg.audio.equalizer.vibrantBass != 0) {
                 for (var i = 0; i < 21; i++) {
-                    CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
+                    CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
                 }}
             },
             changeMix() {

src/renderer/views/pages/settings.ejs

@@ -78,10 +78,10 @@
                         <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.advanced.ciderPPE"  v-on:change="CiderAudio.hierarchical_loading();" switch/>
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.ciderPPE"  v-on:change="CiderAudio.hierarchical_loading();" switch/>
                     </div>
                 </div>
-                <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.advanced.ciderPPE === true">
+                <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.maikiwiAudio.ciderPPE === true">
                     <div class="md-option-segment">
                         {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength')}}
                         <br>
@@ -103,10 +103,10 @@
                         <small>Simulates the analog warmth modelled after the Korg Nutube 6P1</small>
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
-                        <input type="checkbox" v-model="app.cfg.audio.analogWarmth"  v-on:change="CiderAudio.hierarchical_loading();" switch/>
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.analogWarmth"  v-on:change="CiderAudio.hierarchical_loading();" switch/>
                     </div>
                 </div>
-                <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.analogWarmth === true">
+                <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.maikiwiAudio.analogWarmth === true">
                     <div class="md-option-segment">
                         Analog Warmth Intensity
                         <br>
@@ -152,6 +152,16 @@
                         <input type="checkbox" v-model="app.cfg.audio.spatial" v-on:change="toggleSpatial" switch/>
                     </div>
                 </div>
+                <div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
+                    <div class="md-option-segment">
+                        Cider Tuned Spatialization 
+                        <br>
+                        <small>Pre-tuned Spatializing Effect by the Cider Dev Team, disables the customizable settings of Audio Spatialization.</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial" :disabled="app.cfg.audio.spatial === false" v-on:change="toggleSpatial" switch/>
+                    </div>
+                </div>
             </div>
             <div class="md-option-header">
                 <span>{{$root.getLz('settings.header.visual')}}</span>
@@ -874,7 +884,7 @@
                         CiderAudio.hierarchical_loading();
                     }
                 } else {
-                    app.cfg.advanced.ciderPPE = false;
+                    app.cfg.audio.maikiwiAudio.ciderPPE = false;
                     CiderAudio.off();
                 }
             },
@@ -887,10 +897,12 @@
             },
             toggleSpatial: function () {
                 if (app.cfg.audio.spatial) {
-                    if (app.cfg.advanced.ciderPPE === true) {
+                    if (app.cfg.audio.maikiwiAudio.ciderPPE === true && app.cfg.audio.maikiwiAudio.spatial === false) {
                         CiderAudio.spatialOff()
                         app.cfg.audio.spatial = false;
-                        notyf.error(app.getLz('settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility'))                    
+                        notyf.error(app.getLz('settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility'))               
+                        try {
+                        CiderAudio.hierarchical_loading();} catch(e) {}
                     }
                     else {
                         CiderAudio.spatialOn()