diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 26408225..365029ba 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -956,44 +956,6 @@ const CiderAudio = { } } }, - hierarchical_optimizer: function () { - const lastNode = app.cfg.audio.maikiwiAudio.lastNode; // Load from cfg - const firstNode = app.cfg.audio.maikiwiAudio.firstNode; - - if (lastNode === "n0") { - return; - } // do nothing if there's no processing lmao - - CiderAudio.init(() => console.log("CAudio Called back")); - - app.cfg.audio.maikiwiAudio.staticOptimizer.lock = true; // Lock CiderAudio from performing hierarchical loading. - - if (MusicKit.getInstance().isPlaying) { - MusicKit.getInstance().pause(); // Pause first - } - - CiderAudio.audioNodes.optimizedNode = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.optimizedNode.normalize = false; - - const res = CiderAudio.hierarchical_optimizer().then((res) => { - CiderAudio.audioNodes.optimizedNode.buffer = res; - }); - - CiderAudio.off(); // Clean up IMMEDIATELY - - // Load the sucker up - - CiderAudio.hierarchical_unloading(); - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.optimizedNode); - CiderAudio.audioNodes.optimizedNode.connect(CiderAudio.context.destination); - - console.debug("[Cider][Audio] Finished hierarchical loading + Optimizing"); - - if (MusicKit.getInstance().nowPlayingItem != null) { - // Restore playback - MusicKit.getInstance().play().catch(console.error); - } - }, hierarchical_unloading: function () { try { CiderAudio.audioNodes.spatialNode.disconnect(); @@ -1035,9 +997,6 @@ const CiderAudio = { console.debug("[Cider][Audio] Finished hierarchical unloading"); }, hierarchical_loading: async function () { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { - return; - } // Do nothing if locked by optimizer. const configMap = new Map([ ["spatial", app.cfg.audio.maikiwiAudio.spatial === true], diff --git a/src/renderer/audio/cloud/audio.js b/src/renderer/audio/cloud/audio.js index 84c47ce8..d47d9f92 100644 --- a/src/renderer/audio/cloud/audio.js +++ b/src/renderer/audio/cloud/audio.js @@ -893,44 +893,6 @@ const CiderAudio = { } } }, - hierarchical_optimizer: function () { - const lastNode = app.cfg.audio.maikiwiAudio.lastNode; // Load from cfg - const firstNode = app.cfg.audio.maikiwiAudio.firstNode; - - if (lastNode === "n0") { - return; - } // do nothing if there's no processing lmao - - CiderAudio.init(() => console.log("CAudio Called back")); - - app.cfg.audio.maikiwiAudio.staticOptimizer.lock = true; // Lock CiderAudio from performing hierarchical loading. - - if (MusicKit.getInstance().isPlaying) { - MusicKit.getInstance().pause(); // Pause first - } - - CiderAudio.audioNodes.optimizedNode = CiderAudio.context.createConvolver(); - CiderAudio.audioNodes.optimizedNode.normalize = false; - - const res = CiderAudio.hierarchical_optimizer().then((res) => { - CiderAudio.audioNodes.optimizedNode.buffer = res; - }); - - CiderAudio.off(); // Clean up IMMEDIATELY - - // Load the sucker up - - CiderAudio.hierarchical_unloading(); - CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.optimizedNode); - CiderAudio.audioNodes.optimizedNode.connect(CiderAudio.context.destination); - - console.debug("[Cider][Audio] Finished hierarchical loading + Optimizing"); - - if (MusicKit.getInstance().nowPlayingItem != null) { - // Restore playback - MusicKit.getInstance().play().catch(console.error); - } - }, hierarchical_unloading: function () { try { CiderAudio.audioNodes.spatialNode.disconnect(); @@ -972,10 +934,6 @@ const CiderAudio = { console.debug("[Cider][Audio] Finished hierarchical unloading"); }, hierarchical_loading: async function () { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { - return; - } // Do nothing if locked by optimizer. - const configMap = new Map([ ["spatial", app.cfg.audio.maikiwiAudio.spatial === true], ["n6", app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true], diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index cb10804b..422374ca 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -293,7 +293,6 @@ app.modals.equalizer = false }, changeVibrantBass() { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")} if (app.cfg.audio.equalizer.vibrantBass !== '0') { try { for (var i = 0; i < 21; i++) { @@ -310,7 +309,6 @@ } }, changeMix() { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")} if (Math.max(...app.cfg.audio.equalizer.gain) != 0) { try { for (var i = 0; i < 10; i++) { @@ -321,7 +319,6 @@ } }, changeGain(i) { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")} if (Math.max(...app.cfg.audio.equalizer.gain) != 0) { try { CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix @@ -334,11 +331,9 @@ } }, changeFreq(i) { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")} CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i] }, changeQ(i) { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")} CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i] }, resetGain() { @@ -405,7 +400,6 @@ }) }, applyPreset(preset) { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")} Object.assign(this.$root.cfg.audio.equalizer, preset) this.changeVibrantBass() for (var i = 0; i < 10; i++) { diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs index 2792b4c7..5556c484 100644 --- a/src/renderer/views/pages/audiolabs.ejs +++ b/src/renderer/views/pages/audiolabs.ejs @@ -150,16 +150,6 @@ }, methods: { - CiderOptimizer: function () { - if (app.cfg.audio.maikiwiAudio.staticOptimizer.state === true) { - CiderAudio.hierarchical_optimizer(); - } - else { - app.cfg.audio.maikiwiAudio.staticOptimizer.lock = false; - try {CiderAudio.audioNodes.optimizedNode.disconnect(); CiderAudio.audioNodes.optimizedNode = null;} catch (e) {} - CiderAudio.hierarchical_loading() - } - } } })