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

revert even more garbage

Browse source
This commit is contained in:
Maikiwi 2022-02-18 23:56:08 -08:00
parent 258e559f29
commit 02a7fd9e23
2 changed files with 8 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -230,7 +230,7 @@ var CiderAudio = {
hierarchical_unloading: function (){ hierarchical_unloading: function (){
try {CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){} try {CiderAudio.audioNodes.spatialNode.output.disconnect();} catch(e){}
try {CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){} try {CiderAudio.audioNodes.spatialNode.disconnect();} catch(e){}
try {CiderAudio.audioNodes.gainNode.disconnect();} catch(e){} CiderAudio.audioNodes.gainNode.gain.value = 1; try {CiderAudio.audioNodes.gainNode.disconnect();} catch(e){}
try {for (var i of CiderAudio.audioNodes.analogWarmth){i.disconnect();} CiderAudio.audioNodes.analogWarmth = []} catch(e){} try {for (var i of CiderAudio.audioNodes.analogWarmth){i.disconnect();} CiderAudio.audioNodes.analogWarmth = []} catch(e){}
try {for (var i of CiderAudio.audioNodes.llpw){i.disconnect();} CiderAudio.audioNodes.llpw = []} catch(e){} try {for (var i of CiderAudio.audioNodes.llpw){i.disconnect();} CiderAudio.audioNodes.llpw = []} catch(e){}
try {for (var i of CiderAudio.audioNodes.vibrantbassNode){i.disconnect();} CiderAudio.audioNodes.vibrantbassNode = []} catch(e){} try {for (var i of CiderAudio.audioNodes.vibrantbassNode){i.disconnect();} CiderAudio.audioNodes.vibrantbassNode = []} catch(e){}
@ -241,8 +241,6 @@ var CiderAudio = {
hierarchical_loading: function (){ hierarchical_loading: function (){
CiderAudio.hierarchical_unloading(); CiderAudio.hierarchical_unloading();
CiderAudio.audioNodes.gainNode.gain.value = 1;
// Vibrant Bass, CAP, Analog Warmth, Spatial // Vibrant Bass, CAP, Analog Warmth, Spatial
if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 && if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0 &&
app.cfg.audio.maikiwiAudio.ciderPPE === true && app.cfg.audio.maikiwiAudio.ciderPPE === true &&
@ -256,15 +254,11 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial') console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Maikiwi Spatial')
} }
else { else {
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial') console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial')
@ -285,10 +279,7 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
console.log('[Cider][Audio] CAP, Analog Warmth, Maikiwi Spatial') console.log('[Cider][Audio] CAP, Analog Warmth, Maikiwi Spatial')
} }
else { else {
@ -308,10 +299,7 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
app.cfg.audio.normalization = true
app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
console.log('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial') console.log('[Cider][Audio] Vibrant Bass, CAP, Maikiwi Spatial')
} }
else { else {
@ -345,10 +333,7 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
console.log('[Cider][Audio] CAP, Maikiwi Spatial') console.log('[Cider][Audio] CAP, Maikiwi Spatial')
} }
else { else {
@ -368,8 +353,6 @@ var CiderAudio = {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
console.log('[Cider][Audio] Analog Warmth, Maikiwi Spatial') console.log('[Cider][Audio] Analog Warmth, Maikiwi Spatial')
} }
else { else {
@ -425,7 +408,6 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
console.log('[Cider][Audio] Vibrant Bass, Maikiwi Spatial') console.log('[Cider][Audio] Vibrant Bass, Maikiwi Spatial')
@ -442,10 +424,12 @@ var CiderAudio = {
app.cfg.audio.maikiwiAudio.ciderPPE === false && app.cfg.audio.maikiwiAudio.ciderPPE === false &&
app.cfg.audio.spatial === false && app.cfg.audio.spatial === false &&
app.cfg.audio.maikiwiAudio.analogWarmth === false) { app.cfg.audio.maikiwiAudio.analogWarmth === false) {
CiderAudio.vibrantbass_h2_1(true) CiderAudio.vibrantbass_h2_1(true)
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
console.log('[Cider][Audio] Vibrant Bass') console.log('[Cider][Audio] Vibrant Bass')
} }
// CAP // CAP
else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier === 0 &&
@ -473,7 +457,6 @@ var CiderAudio = {
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.audioNodes.gainNode.gain.value += 5
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]);

5
src/renderer/index.js
View file

@ -722,11 +722,6 @@ const app = new Vue({
try { try {
CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak))) CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak)))
} catch (e) {} } catch (e) {}
if (app.cfg.advanced.AudioContext === true) {
if (app.cfg.audio.maikiwiAudio.spatial === true) {
try { CiderAudio.audioNodes.gainNode.gain.value += 5} catch (e) {}
}
}
}) })
ipcRenderer.on('play', function(_event, mode, id) { ipcRenderer.on('play', function(_event, mode, id) {