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

and I forgor

Browse source
This commit is contained in:
maikirakiwi 2022-05-11 18:34:58 -07:00
parent 17f1a4c4fa
commit db0d4d87c6
1 changed files with 63 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -653,10 +653,10 @@ const CiderAudio = {
return new Promise(resolve => { return new Promise(resolve => {
const map = new Map([ const map = new Map([
['h1', Math.max(...app.cfg.audio.equalizer.gain) != 0], ['h1', Math.max(...app.cfg.audio.equalizer.gain) != 0],
['h2_1', app.cfg.audio.equalizer.vibrantBass !== '0'], ['h2_1', app.cfg.audio.equalizer.vibrantBass != 0],
['h2_2', app.cfg.audio.maikiwiAudio.ciderPPE === true], ['h2_2', app.cfg.audio.maikiwiAudio.ciderPPE === true],
['h2_3', app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true], ['h2_3', app.cfg.audio.maikiwiAudio.atmosphereRealizer1 === true],
['h2_4', app.cfg.audio.maikiwiAudio.atmosphereRealizer === true], ['h2_4', app.cfg.audio.maikiwiAudio.atmosphereRealizer2 === true],
['spatial', app.cfg.audio.maikiwiAudio.spatial === true] ['spatial', app.cfg.audio.maikiwiAudio.spatial === true]
]); ]);
@ -674,72 +674,92 @@ const CiderAudio = {
switch (tier) { switch (tier) {
case 'h1': case 'h1':
CiderAudio.equalizer(true, nextTier); CiderAudio.equalizer(true, nextTier);
lastNode = 'h1'; lastNode = 'h1'; nextTier = 1;
break; break;
case 'h2_1': case 'h2_1':
CiderAudio.vibrantbass_h2_1(true, nextTier); CiderAudio.vibrantbass_h2_1(true, nextTier);
lastNode = 'h2_1'; lastNode = 'h2_1'; nextTier = 2;
break; break;
case 'h2_2': case 'h2_2':
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.llpw_h2_2(true, nextTier); CiderAudio.llpw_h2_2(true, nextTier);
lastNode = 'h2_2'; lastNode = 'h2_2'; nextTier = 3;
break; break;
case 'h2_3': case 'h2_3':
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.atmosphereRealizer1_h2_3(true, nextTier); CiderAudio.atmosphereRealizer1_h2_3(true, nextTier);
lastNode = 'h2_3'; lastNode = 'h2_3'; nextTier = 4;
break; break;
case 'h2_4': case 'h2_4':
app.cfg.audio.normalization = true; app.cfg.audio.normalization = true;
CiderAudio.atmosphereRealizer2_h2_4(true, nextTier); CiderAudio.atmosphereRealizer2_h2_4(true, nextTier);
lastNode = 'h2_4'; lastNode = 'h2_4'; nextTier = 5;
break; break;
case 'spatial': case 'spatial':
if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial if (app.cfg.audio.maikiwiAudio.spatial === true) { // Vibrant Bass, CAP, Atmosphere Realizer 1, Maikiwi Spatial
app.cfg.audio.normalization = true app.cfg.audio.normalization = true
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
switch (lastNode) {
case 'h2_4':
try {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
} catch (e) { }
break;
case 'h2_3':
try {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
} catch (e) { }
break;
case 'h2_2':
try {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
} catch (e) { }
break;
case 'h2_1':
try {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
} catch (e) { }
break;
case 'h1':
try {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]);
} catch (e) { }
break;
case 'h0':
try { CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination); } catch (e) { }
break;
}
} }
break; break;
} }
console.debug('nextTier: ' + nextTier + ' | tier: ' + tier); console.debug("nextTier: " + nextTier)
nextTier += 1;
} }
else { else {
nextTier += 2;
} }
} }
console.debug('[Cider][Audio]\n' + configMap.entries());
switch (lastNode) {
case 'h2_4':
if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
}
else {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer2);
}
break;
case 'h2_3':
if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
}
else {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.atmosphereRealizer1);
}
break;
case 'h2_2':
if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
}
else {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
}
break;
case 'h2_1':
if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
}
else {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
}
break;
case 'h1':
if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.audioBands[0]);
}
else {
CiderAudio.audioNodes.spatialgainNodeNode.connect(CiderAudio.audioNodes.audioBands[0]);
}
break;
case 'h0':
if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination)
}
else {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
}
break;
}
console.debug('[Cider][Audio]\n' + [...configMap.entries()] + '\n lastNode: ' + lastNode);
CiderAudio.intelliGainComp_h0_0(); CiderAudio.intelliGainComp_h0_0();
console.debug("[Cider][Audio] Finished hierarchical loading"); console.debug("[Cider][Audio] Finished hierarchical loading");