zynaddsubfx

commit 3d7f0277500dd185e7e1e80e89c64c833959849a
parent 2ff4788cf046625c6f3c734f2ec4ce851644217e
Author: Christopher A. Oliver <[email protected]>
Date:   Tue, 20 Oct 2015 14:03:08 -0400

Move log freq conversion to setpos.
Both setfreq and setfreq_and_q need conversion.

Closes Godfrey's BubblesZyn2-2-1.xiz regression.

Diffstat:
M
src/DSP/FormantFilter.cpp
 | 
20
++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/DSP/FormantFilter.cpp b/src/DSP/FormantFilter.cpp
@@ -173,9 +173,17 @@ void FormantFilter::setpos(float input)
     oldQfactor = Qfactor;
 }
 
+inline float log_2(float x)
+{
+    return logf(x) / logf(2.0f);
+}
+
 void FormantFilter::setfreq(float frequency)
 {
-    setpos(frequency);
+    //Convert form real freq[Hz]
+    const float freq = log_2(frequency) - 9.96578428f; //log2(1000)=9.95748f.
+
+    setpos(freq);
 }
 
 void FormantFilter::setq(float q_)
@@ -188,18 +196,10 @@ void FormantFilter::setq(float q_)
 void FormantFilter::setgain(float /*dBgain*/)
 {}
 
-inline float log_2(float x)
-{
-    return logf(x) / logf(2.0f);
-}
-
 void FormantFilter::setfreq_and_q(float frequency, float q_)
 {
-    //Convert form real freq[Hz]
-    const float freq = log_2(frequency) - 9.96578428f; //log2(1000)=9.95748f.
-
     Qfactor = q_;
-    setpos(freq);
+    setpos(frequency);
 }