diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 6aae7b8f..23721801 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -61,7 +61,6 @@ export class Store { "spatial": false, "spatialType": 0, "vibrantBass": { // Hard coded into the app. Don't include any of this config into exporting presets in store.ts - 'multiplier': 0, 'frequencies': [17.182, 42.169, 53.763, 112.69, 119.65, 264.59, 336.57, 400.65, 505.48, 612.7, 838.7, 1155.3, 1175.6, 3406.8, 5158.6, 5968.1, 6999.9, 7468.6, 8862.9, 9666, 10109], 'Q': [2.5, 0.388, 5, 5, 2.5, 7.071, 14.14, 10, 7.071, 14.14, 8.409, 0.372, 7.071, 10, 16.82, 7.071, 28.28, 20, 8.409, 40, 40], 'gain': [-0.34, 2.49, 0.23, -0.49, 0.23, -0.12, 0.32, -0.29, 0.33, 0.19, -0.18, -1.27, -0.11, 0.25, -0.18, -0.53, 0.34, 1.32, 1.78, 0.41, -0.28] diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index bf3d5ca7..e3ebdb7c 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -416,7 +416,7 @@ const CiderAudio = { CiderAudio.audioNodes.vibrantbassNode[i].type = 'peaking'; // 'peaking'; CiderAudio.audioNodes.vibrantbassNode[i].frequency.value = VIBRANTBASSBANDS[i]; CiderAudio.audioNodes.vibrantbassNode[i].Q.value = VIBRANTBASSQ[i]; - CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * app.cfg.audio.maikiwiAudio.vibrantBass.multiplier; + CiderAudio.audioNodes.vibrantbassNode[i].gain.value = VIBRANTBASSGAIN[i] * (app.cfg.audio.equalizer.vibrantBass / 10); } for (let i = 1; i < VIBRANTBASSBANDS.length; i ++) { @@ -453,7 +453,7 @@ const CiderAudio = { if (Math.max(...app.cfg.audio.equalizer.gain) !== 0) { CiderAudio.equalizer(true, 0); - if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0) { + if (app.cfg.audio.equalizer.vibrantBass !== '0') { CiderAudio.vibrantbass_h2_1(true, 1); if (app.cfg.audio.maikiwiAudio.ciderPPE === true) { // Vibrant Bass, CAP @@ -639,7 +639,7 @@ const CiderAudio = { } } else { //if (Math.max(...app.cfg.audio.equalizer.gain) === 0) - if (app.cfg.audio.maikiwiAudio.vibrantBass.multiplier !== 0) { // Vibrant Bass + if (app.cfg.audio.equalizer.vibrantBass !== '0') { // Vibrant Bass CiderAudio.vibrantbass_h2_1(true, 0) if (app.cfg.audio.maikiwiAudio.ciderPPE === true) { // Vibrant Bass, CAP diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index c2abb0a6..a2530356 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -294,7 +294,6 @@ app.resetState() }, changeVibrantBass() { - app.cfg.audio.maikiwiAudio.vibrantBass.multiplier = app.cfg.audio.equalizer.vibrantBass / 10 if (app.cfg.audio.equalizer.vibrantBass !== '0') { try { for (var i = 0; i < 21; i++) { diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 2e860826..692b6ea1 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -122,7 +122,7 @@ {{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioNormalization.description')}}
- +