okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

I actually tested this one before pushing

Browse source
This commit is contained in:
Maikiwi 2022-11-21 20:09:54 -08:00
parent 00dbb10aa4
commit 58a97ae9be
4 changed files with 0 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/renderer/audio/audio.js
View file

@ -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 () { hierarchical_unloading: function () {
try { try {
CiderAudio.audioNodes.spatialNode.disconnect(); CiderAudio.audioNodes.spatialNode.disconnect();
@ -1035,9 +997,6 @@ const CiderAudio = {
console.debug("[Cider][Audio] Finished hierarchical unloading"); console.debug("[Cider][Audio] Finished hierarchical unloading");
}, },
hierarchical_loading: async function () { hierarchical_loading: async function () {
if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) {
return;
} // Do nothing if locked by optimizer.
const configMap = new Map([ const configMap = new Map([
["spatial", app.cfg.audio.maikiwiAudio.spatial === true], ["spatial", app.cfg.audio.maikiwiAudio.spatial === true],

42
src/renderer/audio/cloud/audio.js
View file

@ -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 () { hierarchical_unloading: function () {
try { try {
CiderAudio.audioNodes.spatialNode.disconnect(); CiderAudio.audioNodes.spatialNode.disconnect();
@ -972,10 +934,6 @@ const CiderAudio = {
console.debug("[Cider][Audio] Finished hierarchical unloading"); console.debug("[Cider][Audio] Finished hierarchical unloading");
}, },
hierarchical_loading: async function () { hierarchical_loading: async function () {
if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) {
return;
} // Do nothing if locked by optimizer.
const configMap = new Map([ const configMap = new Map([
["spatial", app.cfg.audio.maikiwiAudio.spatial === true], ["spatial", app.cfg.audio.maikiwiAudio.spatial === true],
["n6", app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true], ["n6", app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],

6
src/renderer/views/components/equalizer.ejs
View file

@ -293,7 +293,6 @@
app.modals.equalizer = false app.modals.equalizer = false
}, },
changeVibrantBass() { changeVibrantBass() {
if (app.cfg.audio.maikiwiAudio.staticOptimizer.lock === true) { return notyf.error("Static Compilation Mode is enabled.")}
if (app.cfg.audio.equalizer.vibrantBass !== '0') { if (app.cfg.audio.equalizer.vibrantBass !== '0') {
try { try {
for (var i = 0; i < 21; i++) { for (var i = 0; i < 21; i++) {
@ -310,7 +309,6 @@
} }
}, },
changeMix() { 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) { if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
try { try {
for (var i = 0; i < 10; i++) { for (var i = 0; i < 10; i++) {
@ -321,7 +319,6 @@
} }
}, },
changeGain(i) { 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) { if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
try { try {
CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
@ -334,11 +331,9 @@
} }
}, },
changeFreq(i) { 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] CiderAudio.audioNodes.audioBands[i].frequency.value = app.cfg.audio.equalizer.frequencies[i]
}, },
changeQ(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] CiderAudio.audioNodes.audioBands[i].Q.value = app.cfg.audio.equalizer.Q[i]
}, },
resetGain() { resetGain() {
@ -405,7 +400,6 @@
}) })
}, },
applyPreset(preset) { 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) Object.assign(this.$root.cfg.audio.equalizer, preset)
this.changeVibrantBass() this.changeVibrantBass()
for (var i = 0; i < 10; i++) { for (var i = 0; i < 10; i++) {

10
src/renderer/views/pages/audiolabs.ejs
View file

@ -150,16 +150,6 @@
}, },
methods: { 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()
}
}
} }
}) })
</script> </script>