zynaddsubfx

commit 187ae9e1752f5aa3d0dcda110b7fa611929b84aa
parent cc06b5d42755e7841b9528cc250e69473aae9df0
Author: Friedolino <mkirchn@freenet.de>
Date:   Sun, 22 Dec 2019 14:32:14 +0100

fix in distorsion function 7 (limiter) and new waveshapers in oscilgen

Diffstat:
M
src/Misc/WaveShapeSmps.cpp
 | 
1
+
M
src/Synth/OscilGen.cpp
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Misc/WaveShapeSmps.cpp b/src/Misc/WaveShapeSmps.cpp
@@ -146,6 +146,7 @@ void waveShapeSmps(int n,
                 else
                     smps[i] = ( smps[i] < -ws ? -ws+res : smps[i]+res );
                 // and substract the polyblamp-limited offset again: smps[i] = y - f(offs)
+                res = polyblampres(offs, ws, par);
                 if (offs>=0)
                     smps[i] -= ( offs >= ws ? ws-res : offs-res );
                 else
diff --git a/src/Synth/OscilGen.cpp b/src/Synth/OscilGen.cpp
@@ -65,7 +65,7 @@ const rtosc::Ports OscilGen::non_realtime_ports = {
             rOptions(Undistorted,
                 Arctangent, Asymmetric, Pow, Sine, Quantisize,
                 Zigzag, Limiter, Upper Limiter, Lower Limiter,
-                Inverse Limiter, Clip, Asym2, Pow2, sigmoid),
+                Inverse Limiter, Clip, Asym2, Pow2, sigmoid, Tanh, Cubic, Square),
             "Shape of distortion to be applied"),
     rOption(Pfiltertype, rShort("filter"), rOptions(No Filter,
             lp, hp1, hp1b, bp1, bs1, lp2, hp2, bp2, bs2,