From 8b24826f582ab6fe87b759639e1001a89ebbc932 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Thu, 27 Jan 2022 20:43:02 -0800 Subject: [PATCH] vapor said so --- src/main/base/store.ts | 1 + src/renderer/views/components/equalizer.ejs | 122 +++++++------------- 2 files changed, 40 insertions(+), 83 deletions(-) diff --git a/src/main/base/store.ts b/src/main/base/store.ts index a62ac282..b2d8155b 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -55,6 +55,7 @@ export class ConfigStore { } }, "equalizer": { + 'preset': 'default', 'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000], 'gain': [0,0,0,0,0,0,0,0,0,0], 'Q' : [1,1,1,1,1,1,1,1,1,1], diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs index 392390c1..0c6c021d 100644 --- a/src/renderer/views/components/equalizer.ejs +++ b/src/renderer/views/components/equalizer.ejs @@ -5,13 +5,12 @@
- - @@ -156,7 +155,7 @@ } }, - changePreset(preset) { + changePreset() { switch (app.cfg.audio.equalizer.preset) { @@ -168,11 +167,6 @@ 'preamp': 0, 'mix': 1, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; case "boostBrightness": this.app.cfg.audio.equalizer = { @@ -182,11 +176,6 @@ 'preamp': 0, 'mix': 1, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; case "warmth": this.app.cfg.audio.equalizer = { @@ -196,11 +185,6 @@ 'preamp': 0, 'mix': 1, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; case "acoustic": this.app.cfg.audio.equalizer = { @@ -210,11 +194,6 @@ 'preamp': 0, 'mix': 1, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; case "clearVocal": this.app.cfg.audio.equalizer = { @@ -224,11 +203,6 @@ 'preamp': 0, 'mix': 1, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; case "instrumentClarity": this.app.cfg.audio.equalizer = { @@ -238,66 +212,48 @@ 'preamp': 0, 'mix': 1, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; - - case "smileyFace": - this.app.cfg.audio.equalizer = { - 'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000], - 'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5], - 'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2], - 'preamp': 0, - 'mix': 1, - } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; + + case "smileyFace": + this.app.cfg.audio.equalizer = { + 'frequencies': [35, 63, 125, 250, 500, 800, 2000, 4000, 8000, 20000], + 'gain': [5, 0, 0, 0, 0, -5, 0, 0, 0, 5], + 'Q': [0.1, 1, 1, 1, 1, 0.6, 1, 1, 1, 0.2], + 'preamp': 0, + 'mix': 1, + } - case "reduceHarshness": + case "reduceHarshness": + this.app.cfg.audio.equalizer = { + 'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000], + 'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0], + 'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1], + 'preamp': 0, + 'mix': 1, + } + + case "tightPerc": + this.app.cfg.audio.equalizer = { + 'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000], + 'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1], + 'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1], + 'preamp': 0, + 'mix': 1, + } + + case "Maikiwi": this.app.cfg.audio.equalizer = { - 'frequencies': [32, 63, 125, 250, 500, 1128, 2000, 4057, 8000, 16000], - 'gain': [0, 0, 0, 0, 0, 2, 0, -6.4, 0, 0], - 'Q': [1, 1, 1, 1, 1, 2, 1, 1, 1, 1], + 'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000], + 'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2], + 'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1], 'preamp': 0, - 'mix': 1, + 'mix': 1.2, } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; - - case "tightPerc": - this.app.cfg.audio.equalizer = { - 'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000], - 'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1], - 'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1], - 'preamp': 0, - 'mix': 1, - } - for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; - case "Maikiwi": - this.app.cfg.audio.equalizer = { - 'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000], - 'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2], - 'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1], - 'preamp': 0, - 'mix': 1.2, - } + for (var i = 0; i < 10; i++) { - this.changeGain(i) - this.changeFreq(i) - this.changeQ(i)} - break; + this.changeGain(i) + this.changeFreq(i) + this.changeQ(i)} + break; } }