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

WIP Audio Thingies

Browse source
This commit is contained in:
Maikiwi 2022-02-18 22:23:44 -08:00
parent a42a88ad6c
commit a12d629a8a
8 changed files with 164 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/renderer/views/components/audio-settings.ejs
View file

@ -23,9 +23,9 @@
<div class="name">{{app.getLz('term.audioControls')}}</div>
</button>
<button class="playlist-item"
@click="$root.appRoute('audiolabs')" style="width:100%;">
@click="openCiderAudioLab" style="width:100%;">
<div class="icon"><%- include("../svg/speaker.svg") %></div>
<div class="name">Audio Labs</div>
<div class="name">Cider Audio Lab</div>
</button>
</div>
</div>
@ -59,7 +59,15 @@
openAudioControls() {
app.modals.audioControls = true
app.modals.audioSettings = false
}
},
openCiderAudioLab() {
if (app.cfg.advanced.AudioContext === true) {
$root.appRoute('audiolabs')
} else {
notyf.error("Cider Audio Lab requires 'Advanced Functionality' to be enabled.")
}
}
},
}
});
);
</script>

3
src/renderer/views/components/equalizer.ejs
View file

@ -305,10 +305,11 @@
changeVibrantBass() {
app.cfg.audio.maikiwiAudio.vibrantBass.multiplier = app.cfg.audio.equalizer.vibrantBass / 10
CiderAudio.hierarchical_loading();
/**
if (app.cfg.audio.equalizer.vibrantBass != 0) {
for (var i = 0; i < 21; i++) {
CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
}}
}} */
},
changeMix() {
for (var i = 0; i < 10; i++) {

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

@ -138,8 +138,7 @@
<small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.description')}}</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<input type="checkbox" v-model="app.cfg.audio.normalization" v-on:change="toggleNormalization"
switch/>
<input type="checkbox" v-model="app.cfg.audio.normalization" v-on:change="toggleNormalization" :disabled="app.cfg.audio.equalizer.vibrantBass !== 0 || app.cfg.audio.maikiwiAudio.spatial === true" switch/>
</div>
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext">
@ -886,12 +885,12 @@
app.cfg.advanced.experiments.splice(app.cfg.advanced.experiments.indexOf(flag), 1);
},
toggleAudioContext: function () {
if (app.cfg.advanced.AudioContext) {
if (app.cfg.advanced.AudioContext === true) {
CiderAudio.init();
if (app.cfg.audio.normalization) {
if (app.cfg.audio.normalization === true) {
CiderAudio.normalizerOn()
}
if (app.cfg.audio.spatial) {
if (app.cfg.audio.spatial === true) {
CiderAudio.spatialOn()
CiderAudio.hierarchical_loading();
}
@ -908,19 +907,11 @@
}
},
toggleSpatial: function () {
if (app.cfg.audio.spatial) {
if (app.cfg.audio.maikiwiAudio.ciderPPE === true && app.cfg.audio.maikiwiAudio.spatial === false) {
CiderAudio.spatialOff()
app.cfg.audio.spatial = false;
notyf.error(app.getLz('settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility'))
try {
CiderAudio.hierarchical_loading();} catch(e) {}
}
else {
if (app.cfg.audio.spatial) {
CiderAudio.spatialOn()
CiderAudio.hierarchical_loading();
}
} else {
else {
CiderAudio.spatialOff()
}