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

debug messages and adding switches

Browse source
This commit is contained in:
Maikiwi 2022-02-15 19:23:35 -08:00
parent 24970d1712
commit 182e4a0611
3 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/base/store.ts
View file

@ -37,7 +37,7 @@ export class Store {
"ciderPPE": false, "ciderPPE": false,
"ciderPPE_value": 0.5, "ciderPPE_value": 0.5,
"analogWarmth": false, "analogWarmth": false,
"analogWarmth_value": 0.75, "analogWarmth_value": 1.25,
"spatial": false, "spatial": false,
"spatial_properties": { "spatial_properties": {
"presets": [], "presets": [],

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

@ -231,13 +231,14 @@ var CiderAudio = {
// Vibrant Bass, CAP, Analog Warmth // Vibrant Bass, CAP, Analog Warmth
if (app.cfg.audio.vibrantBass.multiplier !== 0 && if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
app.cfg.advanced.ciderPPE === true && app.cfg.advanced.ciderPPE === true &&
app.cfg.audio.spatial === true && app.cfg.audio.spatial === false &&
app.cfg.audio.analogWarmth === true) { app.cfg.audio.analogWarmth === true) {
CiderAudio.vibrantbass_h2_1(true) CiderAudio.vibrantbass_h2_1(true)
CiderAudio.llpw_h2_2(true, 2); CiderAudio.llpw_h2_2(true, 2);
CiderAudio.analogWarmth_h2_3(true, 3); CiderAudio.analogWarmth_h2_3(true, 3);
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')
} }
// CAP, Analog Warmth // CAP, Analog Warmth
else if (app.cfg.audio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
@ -246,8 +247,9 @@ var CiderAudio = {
app.cfg.audio.analogWarmth === true) { app.cfg.audio.analogWarmth === true) {
CiderAudio.llpw_h2_2(true, 1); CiderAudio.llpw_h2_2(true, 1);
CiderAudio.analogWarmth_h2_3(true, 2); CiderAudio.analogWarmth_h2_3(true, 3);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] CAP and Analog Warmth')
} }
// Vibrant Bass, Analog Warmth // Vibrant Bass, Analog Warmth
else if (app.cfg.audio.vibrantBass.multiplier !== 0 && else if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
@ -258,6 +260,7 @@ var CiderAudio = {
CiderAudio.vibrantbass_h2_1(true) CiderAudio.vibrantbass_h2_1(true)
CiderAudio.analogWarmth_h2_3(true, 2); CiderAudio.analogWarmth_h2_3(true, 2);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] Vibrant Bass, Analog Warmth')
} }
// Vibrant Bass, CAP // Vibrant Bass, CAP
@ -269,6 +272,7 @@ var CiderAudio = {
CiderAudio.vibrantbass_h2_1(true) CiderAudio.vibrantbass_h2_1(true)
CiderAudio.llpw_h2_2(true, 2); CiderAudio.llpw_h2_2(true, 2);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
console.log('[Cider][Audio] Vibrant Bass, CAP')
} }
// Vibrant Bass, Spatial // Vibrant Bass, Spatial
else if (app.cfg.audio.vibrantBass.multiplier !== 0 && else if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
@ -279,6 +283,7 @@ var CiderAudio = {
CiderAudio.vibrantbass_h2_1(true) CiderAudio.vibrantbass_h2_1(true)
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.vibrantbassNode[0]); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
console.log('[Cider][Audio] Vibrant Bass, Spatial')
} }
// Vibrant Bass // Vibrant Bass
else if (app.cfg.audio.vibrantBass.multiplier !== 0 && else if (app.cfg.audio.vibrantBass.multiplier !== 0 &&
@ -287,6 +292,7 @@ var CiderAudio = {
app.cfg.audio.analogWarmth === false) { app.cfg.audio.analogWarmth === false) {
CiderAudio.vibrantbass_h2_1(true) CiderAudio.vibrantbass_h2_1(true)
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.vibrantbassNode[0]);
console.log('[Cider][Audio] Vibrant Bass')
} }
// CAP // CAP
else if (app.cfg.audio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
@ -295,14 +301,16 @@ var CiderAudio = {
app.cfg.audio.analogWarmth === false) { app.cfg.audio.analogWarmth === false) {
CiderAudio.llpw_h2_2(true, 1); CiderAudio.llpw_h2_2(true, 1);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.llpw[0]);
console.log('[Cider][Audio] CAP')
} }
// Analog Warmth // Analog Warmth
else if (app.cfg.audio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
app.cfg.advanced.ciderPPE === false && app.cfg.advanced.ciderPPE === false &&
app.cfg.audio.spatial === false && app.cfg.audio.spatial === false &&
app.cfg.audio.analogWarmth === true) { app.cfg.audio.analogWarmth === true) {
CiderAudio.analogWarmth_h2_2(true, 1); CiderAudio.analogWarmth_h2_3(true, 1);
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.analogWarmth[0]);
console.log('[Cider][Audio] Analog Warmth')
} }
// Spatial // Spatial
else if (app.cfg.audio.vibrantBass.multiplier === 0 && else if (app.cfg.audio.vibrantBass.multiplier === 0 &&
@ -311,11 +319,13 @@ var CiderAudio = {
app.cfg.audio.analogWarmth === false){ app.cfg.audio.analogWarmth === false){
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input); CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);
CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]); CiderAudio.audioNodes.spatialNode.output.connect(CiderAudio.audioNodes.audioBands[0]);
console.log('[Cider][Audio] Spatial')
} }
// Nothing // Nothing
else { else {
CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]); // If CAP & vibrant bass is disabled CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.audioBands[0]);
console.log('[Cider][Audio] Nothing') // If CAP & vibrant bass is disabled
} }
console.log("[Cider][Audio] Finished hierarchical loading"); console.log("[Cider][Audio] Finished hierarchical loading");

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

@ -103,11 +103,14 @@
<small>Changes the intensity of the Analog Warmth Module processing.</small> <small>Changes the intensity of the Analog Warmth Module processing.</small>
</div> </div>
<div class="md-option-segment md-option-segment_auto"> <div class="md-option-segment md-option-segment_auto">
<button class="md-btn" :disabled="app.cfg.audio.analogWarmth_value === 0.75" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1; CiderAudio.hierarchical_loading();"> <button class="md-btn" :disabled="app.cfg.audio.analogWarmth_value === 1.25" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.25; CiderAudio.hierarchical_loading();">
Smooth
</button>
<button class="md-btn" :disabled="app.cfg.audio.analogWarmth_value === 1.5" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.5; CiderAudio.hierarchical_loading();">
Warm Warm
</button> </button>
<button class="md-btn" style="margin-top: 5px;" :disabled="app.cfg.audio.analogWarmth_value === 1" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.5; CiderAudio.hierarchical_loading();"> <button class="md-btn" style="margin-top: 5px;" :disabled="app.cfg.audio.analogWarmth_value === 1.75" v-model="app.cfg.audio.analogWarmth_value" onclick="app.cfg.audio.analogWarmth_value = 1.75; CiderAudio.hierarchical_loading();">
Extra Warm Ex. Warm
</button> </button>
</div> </div>
</div> </div>