zynaddsubfx

commit 5ba53a4fcd3b2cefde727989db4dbd777d04d87e
parent 7a6d40d7dd72e097bb4c6e58438b6d784792168d
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sun, 27 Jun 2010 14:12:25 -0400

Phaser: fixed last? of merge issues

Diffstat:
M
src/Effects/Phaser.cpp
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Effects/Phaser.cpp b/src/Effects/Phaser.cpp
@@ -104,8 +104,8 @@ void Phaser::AnalogPhase(const Stereo<REALTYPE *> &input)
     Stereo<REALTYPE> gain(0.0), lfoVal(0.0), mod(0.0), g(0.0), b(0.0), hpf(0.0);
 
     lfo.effectlfoout(&lfoVal.l, &lfoVal.r);
-    mod.l = lfoVal.l*width + depth;
-    mod.r = lfoVal.r*width + depth;
+    mod.l = lfoVal.l*width + (depth - 0.5f);
+    mod.r = lfoVal.r*width + (depth - 0.5f);
 
     mod.l = limit(mod.l, ZERO_, ONE_);
     mod.r = limit(mod.r, ZERO_, ONE_);
@@ -206,7 +206,7 @@ void Phaser::normalPhase(const Stereo<REALTYPE *> &input)
                             input.r[i] * (1.0 - panning) + fb.r);
 
         Stereo<REALTYPE> g(gain.l * x + oldgain.l * x1,
-                           gain.l * x + oldgain.r * x1);
+                           gain.r * x + oldgain.r * x1);
 
         xn.l = applyPhase(xn.l, g.l, old.l);
         xn.r = applyPhase(xn.r, g.r, old.r);