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

Remove spatial compat check

Browse source
This commit is contained in:
Maikiwi 2022-02-17 22:57:26 -08:00
parent 4d22a257ac
commit 542d3a348c
2 changed files with 52 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -236,8 +236,33 @@ var CiderAudio = {
hierarchical_loading: function (){ hierarchical_loading: function (){
CiderAudio.hierarchical_unloading(); CiderAudio.hierarchical_unloading();
// Vibrant Bass, CAP, Analog Warmth // Vibrant Bass, CAP, Analog Warmth, Spatial
if (app.cfg.audio.vibrantBass.multiplier !== 0 && if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
app.cfg.advanced.ciderPPE === true &&
app.cfg.audio.spatial === true &&
app.cfg.audio.analogWarmth === true) {
CiderAudio.vibrantbass_h2_1(true)
CiderAudio.llpw_h2_2(true, 2);
CiderAudio.analogWarmth_h2_3(true, 3);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth, Spatial')
}
// Vibrant Bass, CAP, Spatial
else if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
app.cfg.advanced.ciderPPE === true &&
app.cfg.audio.spatial === true &&
app.cfg.audio.analogWarmth === false) {
CiderAudio.vibrantbass_h2_1(true)
CiderAudio.llpw_h2_2(true, 2);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
console.log('[Cider][Audio] Vibrant Bass, CAP, Spatial')
}
// Vibrant Bass, CAP, Analog Warmth
else if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
app.cfg.advanced.ciderPPE === true && app.cfg.advanced.ciderPPE === true &&
app.cfg.audio.spatial === false && app.cfg.audio.spatial === false &&
app.cfg.audio.analogWarmth === true) { app.cfg.audio.analogWarmth === true) {
@ -248,6 +273,29 @@ var CiderAudio = {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth') console.log('[Cider][Audio] Vibrant Bass, CAP, Analog Warmth')
} }
// CAP, Spatial
else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
app.cfg.advanced.ciderPPE === true &&
app.cfg.audio.spatial === true &&
app.cfg.audio.analogWarmth === false) {
CiderAudio.llpw_h2_2(true, 1);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.llpw[0]);
console.log('[Cider][Audio] CAP, Spatial')
}
// Analog Warmth, Spatial
else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
app.cfg.advanced.ciderPPE === false &&
app.cfg.audio.spatial === true &&
app.cfg.audio.analogWarmth === true) {
CCiderAudio.analogWarmth_h2_3(true, 1);
//CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialNode);
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] Analog Warmth, Spatial')
}
// CAP, Analog Warmth // CAP, Analog Warmth
else if (app.cfg.audio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
app.cfg.advanced.ciderPPE === true && app.cfg.advanced.ciderPPE === true &&

6
src/renderer/views/pages/settings.ejs
View file

@ -78,7 +78,7 @@
<small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small> <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}</small>
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.advanced.ciderPPE" :disabled="app.cfg.audio.spatial === true" v-on:change="CiderAudio.hierarchical_loading();" switch/> <input type="checkbox" v-model="app.cfg.advanced.ciderPPE" v-on:change="CiderAudio.hierarchical_loading();" switch/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.advanced.ciderPPE === true"> <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.advanced.ciderPPE === true">
@ -103,7 +103,7 @@
<small>Simulates the analog warmth modelled after the Korg Nutube 6P1</small> <small>Simulates the analog warmth modelled after the Korg Nutube 6P1</small>
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.audio.analogWarmth" :disabled="app.cfg.audio.spatial === true" v-on:change="CiderAudio.hierarchical_loading();" switch/> <input type="checkbox" v-model="app.cfg.audio.analogWarmth" v-on:change="CiderAudio.hierarchical_loading();" switch/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.analogWarmth === true"> <div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.audio.analogWarmth === true">
@ -149,7 +149,7 @@
<small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description')}}</small> <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description')}}</small>
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.audio.spatial" :disabled="app.cfg.advanced.ciderPPE === true" v-on:change="toggleSpatial" switch/> <input type="checkbox" v-model="app.cfg.audio.spatial" v-on:change="toggleSpatial" switch/>
</div> </div>
</div> </div>
</div> </div>