Skip to content

Commit 8e5259d

Browse files
First warking UI for mono saturator
1 parent ba3b1de commit 8e5259d

2 files changed

Lines changed: 33 additions & 29 deletions

File tree

res/main/ui/plugins/effects/saturator/plugin.xml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,46 @@
22
<grid rows="1" cols="3" spacing="4">
33

44
<!-- Row 1 -->
5-
<label text="TODO Pre EQ" />
6-
<cell cols="4">
5+
<cell cols="1">
76
<group text="TODO Pre EQ" >
8-
<knob id="gp_0" />
9-
<knob id="gp_1" />
10-
<knob id="gp_2" />
7+
<grid rows="3">
8+
<knob id="gp_0" />
9+
<knob id="gp_1" />
10+
<knob id="gp_2" />
11+
</grid>
1112
</group>
1213
</cell>
1314

14-
<label text="TODO Saturator" />
15-
<cell cols="4">
15+
<cell cols="1">
1616
<group text="TODO Saturator" >
17+
<grid rows="16">
1718
<combo id="ov" />
18-
<knob id="ge" />
19-
<knov id="gt" />
20-
<combo id="sp" />
21-
22-
<knob id="sl" visibility="(:sp ieq 0)" />
23-
<knob id="sh" visibility="(:sp ieq 1) or (:sp ieq 2) or (:sp ieq 3) or (:sp ieq 4) or (:sp ieq 5) or (:sp ieq 9) "/>
24-
<knob id="hl" visibility="(:sp ieq 6) or (:sp ieq 7)" />
25-
<knob id="ll" visibility="(:sp ieq 6) or (:sp ieq 7)" />
26-
<knob id="rd" visibility="(:sp ieq 8)" />
27-
<knob id="lv" visibility="(:sp ieq 10) or (:sp ieq 11) or (:sp ieq 12)" />
28-
<knob id="cp" visibility="(:sp ieq 13) or (:sp ieq 14) or (:sp ieq 15) or (:sp ieq 16)" />
29-
<knob id="qp" visibility="(:sp ieq 17) or (:sp ieq 18) or (:sp ieq 19) or (:sp ieq 20)" />
30-
<knob id="bs" visibility="(:sp ieq 19) or (:sp ieq 20)" />
31-
<knob id="bl" visibility="(:sp ieq 21)" />
32-
<knob id="dv" visibility="(:sp ieq 21)" />
19+
<knob id="ge" />
20+
<knob id="gt" />
21+
<combo id="sp" />
22+
23+
<knob id="sl" visibility="(:sp ieq 0)" />
24+
<knob id="sh" visibility="(:sp ieq 1) or (:sp ieq 2) or (:sp ieq 3) or (:sp ieq 4) or (:sp ieq 5) or (:sp ieq 9) "/>
25+
<knob id="hl" visibility="(:sp ieq 6) or (:sp ieq 7)" />
26+
<knob id="ll" visibility="(:sp ieq 6) or (:sp ieq 7)" />
27+
<knob id="rd" visibility="(:sp ieq 8)" />
28+
<knob id="lv" visibility="(:sp ieq 10) or (:sp ieq 11) or (:sp ieq 12)" />
29+
<knob id="cp" visibility="(:sp ieq 13) or (:sp ieq 14) or (:sp ieq 15) or (:sp ieq 16)" />
30+
<knob id="qp" visibility="(:sp ieq 17) or (:sp ieq 18) or (:sp ieq 19) or (:sp ieq 20)" />
31+
<knob id="bs" visibility="(:sp ieq 19) or (:sp ieq 20)" />
32+
<knob id="bl" visibility="(:sp ieq 21)" />
33+
<knob id="dv" visibility="(:sp ieq 21)" />
34+
</grid>
3335
</group>
3436
</cell>
3537

36-
<label text="TODO Post EQ" />
37-
<cell cols="4">
38+
<cell cols="1">
3839
<group text="TODO Post EQ" >
39-
<knob id="gs_0" />
40-
<knob id="gs_1" />
41-
<knob id="gs_2" />
40+
<grid rows="3">
41+
<knob id="gs_0" />
42+
<knob id="gs_1" />
43+
<knob id="gs_2" />
44+
</grid>
4245
</group>
4346
</cell>
4447

src/main/plug/saturator.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ namespace lsp
187187
c->sPostEQ.construct();
188188

189189
c->sPreEQ.init(nBands, meta::saturator::FFT_RANK);
190+
c->sOversampler.init();
190191
c->sPostEQ.init(nBands, meta::saturator::FFT_RANK);
191192

192193
c->pIn = NULL;
@@ -840,10 +841,10 @@ namespace lsp
840841
c->sPreEQ.process(vBuffer, in, to_do);
841842
dsp::mul_k2(vBuffer, c->sShaperParams.fPreGain, to_do);
842843
c->sOversampler.upsample(vOSBuffer, vBuffer, to_do);
843-
c->sShaper.process_overwrite(vOSBuffer, vBuffer, to_do_up);
844+
c->sShaper.process_overwrite(vOSBuffer, vOSBuffer, to_do_up);
844845
c->sOversampler.downsample(vBuffer, vOSBuffer, to_do);
845846
dsp::mul_k2(vBuffer, c->sShaperParams.fPostGain, to_do);
846-
c->sPostEQ.process(vBuffer, in, to_do);
847+
c->sPostEQ.process(vBuffer, vBuffer, to_do);
847848

848849
// Process the
849850
// - dry (unprocessed) signal stored in 'in'

0 commit comments

Comments
 (0)