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 17:57:32 -08:00
commit d89679436f
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -76,7 +76,8 @@ const CiderAudio = {
} }
CiderAudio.equalizer() CiderAudio.equalizer()
}, },
normalizerOn: function (){}, normalizerOn: function (){
},
normalizerOff: function (){ normalizerOff: function (){
CiderAudio.audioNodes.gainNode.gain.setTargetAtTime(1, CiderAudio.context.currentTime+ 1, 0.5); CiderAudio.audioNodes.gainNode.gain.setTargetAtTime(1, CiderAudio.context.currentTime+ 1, 0.5);
}, },
@ -84,7 +85,7 @@ const CiderAudio = {
spatialOn: function (){ spatialOn: function (){
if (app.cfg.audio.maikiwiAudio.spatial === true) { if (app.cfg.audio.maikiwiAudio.spatial === true) {
CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver(); CiderAudio.audioNodes.spatialNode = CiderAudio.context.createConvolver();
CiderAudio.audioNodes.spatialNode.normalize = true;
switch (app.cfg.audio.maikiwiAudio.spatialType) { switch (app.cfg.audio.maikiwiAudio.spatialType) {
case 0: case 0:
fetch('./audio/impulses/CiderSpatial_Conv.wav').then(async (impulseData) => { fetch('./audio/impulses/CiderSpatial_Conv.wav').then(async (impulseData) => {
@ -109,7 +110,6 @@ const CiderAudio = {
app.cfg.audio.maikiwiAudio.spatialType = 0; app.cfg.audio.maikiwiAudio.spatialType = 0;
break; break;
} }
CiderAudio.audioNodes.spatialNode.normalize = true;
CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination); CiderAudio.audioNodes.spatialNode.connect(CiderAudio.context.destination);
} }
else { else {

14
src/renderer/views/pages/audiolabs.ejs
View file

@ -119,7 +119,7 @@
</div> </div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true"> <div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
<div class="md-option-segment"> <div class="md-option-segment">
Cider Origami Vocal Enhance/Remaster™️ Cider Origami™️ Vocal Enhancer/Remasterer
<br> <br>
<small>Re-textures the vocals by carving out the frequencies and adjusts them to the selected profile.<br> <small>Re-textures the vocals by carving out the frequencies and adjusts them to the selected profile.<br>
<b>Modern:</b> <b>Modern:</b>
@ -169,10 +169,22 @@
methods: { methods: {
toggleSpatial: function () { toggleSpatial: function () {
if (app.cfg.audio.spatial) { if (app.cfg.audio.spatial) {
if (app.cfg.audio.maikiwiAudio.spatial === false) {
if (app.mk.volume - 0.2512 > 0) {app.mk.volume -= 0.2512}
else {app.mk.volume = 0.0001}
}
CiderAudio.spatialOn() CiderAudio.spatialOn()
CiderAudio.hierarchical_loading(); CiderAudio.hierarchical_loading();
if (app.cfg.audio.maikiwiAudio.spatial === true) {
if (app.mk.volume + 0.2512 < 1) {app.mk.volume += 0.2512}
else {app.mk.volume = 1}
}
} }
else { else {
if (app.cfg.audio.maikiwiAudio.spatial === true) {
if (app.mk.volume - 0.2512 > 0) {app.mk.volume -= 0.2512}
else {app.mk.volume = 0.0001}
}
app.cfg.audio.maikiwiAudio.spatial = false; app.cfg.audio.maikiwiAudio.spatial = false;
CiderAudio.spatialOff() CiderAudio.spatialOff()
} }