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

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

Browse source
This commit is contained in:
booploops 2022-03-08 19:11:28 -08:00
commit 8ece7fadd4
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,14 +67,14 @@ const CiderAudio = {
} else {try{CiderAudio.source.disconnect(CiderAudio.context.destination)}catch(e){}} } else {try{CiderAudio.source.disconnect(CiderAudio.context.destination)}catch(e){}}
CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain() CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain()
CiderAudio.source.connect(CiderAudio.audioNodes.gainNode); CiderAudio.source.connect(CiderAudio.audioNodes.gainNode);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
if(app.cfg.audio.normalization){ if(app.cfg.audio.normalization){
CiderAudio.normalizerOn() CiderAudio.normalizerOn()
} }
if (app.cfg.audio.spatial){ if (app.cfg.audio.spatial){
CiderAudio.spatialOn() CiderAudio.spatialOn()
} }
CiderAudio.equalizer() CiderAudio.equalizer();
CiderAudio.hierarchical_loading();
}, },
normalizerOn: function (){ normalizerOn: function (){
}, },
@ -110,13 +110,9 @@ const CiderAudio = {
app.cfg.audio.maikiwiAudio.spatialType = 0; app.cfg.audio.maikiwiAudio.spatialType = 0;
break; break;
} }
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination);
} }
else { else {
try{
CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){}
CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context); CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.context.destination);
let roomDimensions = { let roomDimensions = {
width: 32, width: 32,
height: 12, height: 12,
@ -643,13 +639,11 @@ const CiderAudio = {
CiderAudio.audioNodes.audioBands[i].gain.value = GAIN[i] * app.cfg.audio.equalizer.mix; CiderAudio.audioNodes.audioBands[i].gain.value = GAIN[i] * app.cfg.audio.equalizer.mix;
} }
// Dynamic-ish loading
CiderAudio.hierarchical_loading();
for (let i = 1; i < BANDS.length; i ++) { for (let i = 1; i < BANDS.length; i ++) {
CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]); CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]);
} }
CiderAudio.audioNodes.audioBands[BANDS.length-1].connect(CiderAudio.context.destination); CiderAudio.audioNodes.audioBands[BANDS.length-1].connect(CiderAudio.context.destination);
} }
} }