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

backport audio fixes

Browse source
This commit is contained in:
Maikiwi 2022-03-08 21:36:43 -08:00
parent df2f7b7216
commit bc43d742ff
2 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,14 +67,14 @@ const CiderAudio = {
} else {try{CiderAudio.source.disconnect(CiderAudio.context.destination)}catch(e){}}
CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain()
CiderAudio.source.connect(CiderAudio.audioNodes.gainNode);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
if(app.cfg.audio.normalization){
CiderAudio.normalizerOn()
}
if (app.cfg.audio.spatial){
CiderAudio.spatialOn()
}
CiderAudio.equalizer()
CiderAudio.equalizer();
CiderAudio.hierarchical_loading();
},
normalizerOn: function (){
},
@ -108,15 +108,11 @@ const CiderAudio = {
});
app.cfg.audio.maikiwiAudio.spatialType = 0;
break;
}
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination);
break;
}
}
else {
try{
CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.context.destination);} catch(e){}
CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.context.destination);
CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
let roomDimensions = {
width: 32,
height: 12,
@ -134,7 +130,7 @@ const CiderAudio = {
CiderAudio.audioNodes.spatialNode.setRoomProperties(roomDimensions, roomMaterials);
CiderAudio.audioNodes.spatialInput = CiderAudio.audioNodes.spatialNode.createSource();
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);}
},
},
spatialOff: function (){
CiderAudio.hierarchical_loading();
},
@ -643,13 +639,11 @@ const CiderAudio = {
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 ++) {
CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]);
}
CiderAudio.audioNodes.audioBands[BANDS.length-1].connect(CiderAudio.context.destination);
}
}