some filters

svn path=/trunk/externals/tb/; revision=1917

13 files changed, 822 insertions, 8 deletions

diff --git a/sc4pd/config-pd-linux.txt b/sc4pd/config-pd-linux.txt
index 9b46ed4..1e95392 100755
--- a/sc4pd/config-pd-linux.txt
+++ b/sc4pd/config-pd-linux.txt
@@ -1,7 +1,7 @@
 # config file for sc4pd, adapted from Thomas Grill's xsample makefile
 
 # your c++ compiler (if not g++)
-# CXX=icc
+ CXX=icc
 
 
 # where does the PD installation reside?
diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt
index d6e04d5..6e6c552 100755
--- a/sc4pd/make-files.txt
+++ b/sc4pd/make-files.txt
@@ -13,4 +13,5 @@ SRCS= \
 	Lag2.cpp Lag3.cpp LinExp.cpp DelayUnit.cpp DelayN.cpp DelayL.cpp \
 	DelayC.cpp CombN.cpp CombL.cpp CombC.cpp AllpassN.cpp AllpassL.cpp \
 	AllpassC.cpp PitchShift.cpp Resonz.cpp OnePole.cpp OneZero.cpp \
-	TwoPole.cpp TwoZero.cpp FOS.cpp SOS.cpp
+	TwoPole.cpp TwoZero.cpp FOS.cpp SOS.cpp RLPF.cpp RHPF.cpp LPF.cpp \
+	HPF.cpp
diff --git a/sc4pd/pd/hpf.pd b/sc4pd/pd/hpf.pd
new file mode 100644
index 0000000..82de175
--- /dev/null
+++ b/sc4pd/pd/hpf.pd
@@ -0,0 +1,11 @@
+#N canvas 0 0 450 300 10;
+#X obj 124 220 dac~;
+#X floatatom 224 81 5 0 0 0 - - -;
+#X obj 130 89 WhiteNoise~;
+#X msg 201 121 kfreq \$1;
+#X obj 130 147 HPF~ 10000;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 3 0 4 0;
+#X connect 4 0 0 0;
+#X connect 4 0 0 1;
diff --git a/sc4pd/pd/lpf.pd b/sc4pd/pd/lpf.pd
new file mode 100644
index 0000000..1b952d6
--- /dev/null
+++ b/sc4pd/pd/lpf.pd
@@ -0,0 +1,11 @@
+#N canvas 0 0 450 300 10;
+#X obj 124 220 dac~;
+#X floatatom 224 81 5 0 0 0 - - -;
+#X obj 130 89 WhiteNoise~;
+#X msg 201 121 kfreq \$1;
+#X obj 130 147 LPF~ 440;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 3 0 4 0;
+#X connect 4 0 0 0;
+#X connect 4 0 0 1;
diff --git a/sc4pd/pd/rhpf.pd b/sc4pd/pd/rhpf.pd
new file mode 100644
index 0000000..228f368
--- /dev/null
+++ b/sc4pd/pd/rhpf.pd
@@ -0,0 +1,15 @@
+#N canvas 0 0 450 300 10;
+#X obj 124 220 dac~;
+#X floatatom 224 81 5 0 0 0 - - -;
+#X obj 130 89 WhiteNoise~;
+#X msg 201 121 kfreq \$1;
+#X floatatom 294 81 5 0 0 0 - - -;
+#X msg 271 121 kradius \$1;
+#X obj 130 147 RHPF~ 10000 0;
+#X connect 1 0 3 0;
+#X connect 2 0 6 0;
+#X connect 3 0 6 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 0 0;
+#X connect 6 0 0 1;
diff --git a/sc4pd/pd/rlpf.pd b/sc4pd/pd/rlpf.pd
new file mode 100644
index 0000000..1203edb
--- /dev/null
+++ b/sc4pd/pd/rlpf.pd
@@ -0,0 +1,15 @@
+#N canvas 0 0 450 300 10;
+#X obj 124 220 dac~;
+#X floatatom 224 81 5 0 0 0 - - -;
+#X obj 130 89 WhiteNoise~;
+#X msg 201 121 kfreq \$1;
+#X floatatom 294 81 5 0 0 0 - - -;
+#X msg 271 121 kradius \$1;
+#X obj 130 147 RLPF~ 440 0.5;
+#X connect 1 0 3 0;
+#X connect 2 0 6 0;
+#X connect 3 0 6 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 0 0;
+#X connect 6 0 0 1;
diff --git a/sc4pd/source/HPF.cpp b/sc4pd/source/HPF.cpp
new file mode 100644
index 0000000..85de643
--- /dev/null
+++ b/sc4pd/source/HPF.cpp
@@ -0,0 +1,180 @@
+/* sc4pd 
+   HPF~
+
+   Copyright (c) 2004 Tim Blechmann.
+
+   This code is derived from:
+	SuperCollider real time audio synthesis system
+    Copyright (c) 2002 James McCartney. All rights reserved.
+	http://www.audiosynth.com
+
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+   Based on:
+     PureData by Miller Puckette and others.
+         http://www.crca.ucsd.edu/~msp/software.html
+     FLEXT by Thomas Grill
+         http://www.parasitaere-kapazitaeten.net/ext
+     SuperCollider by James McCartney
+         http://www.audiosynth.com
+     
+   Coded while listening to: Peter Kowald & Tatsuya Nakatani: 
+                             13 Definitions of Truth
+
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ HPF~ -------------------------------*/
+
+class HPF_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(HPF_ar,sc4pd_dsp);
+    
+public:
+    HPF_ar(int argc, t_atom *argv);
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out);
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	mRadiansPerSample = sc_radianspersample();
+	mFilterSlope = sc_filterslope();
+	mFilterLoops = sc_filterloops();
+	mFilterRemain = sc_filterremain();
+    }
+
+    void m_set_freq(float f)
+    {
+	m_freq=f;
+	changed = true;
+    }
+
+private:
+    float m_y1, m_y2, m_a0, m_b1, m_b2, m_freq;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+};
+
+FLEXT_LIB_DSP_V("HPF~",HPF_ar);
+
+HPF_ar::HPF_ar(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"kfreq",m_set_freq);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    m_freq = sc_getfloatarg(Args,0);
+    changed = true;
+    
+    AddOutSignal();
+
+    m_a0 = 0.f;
+    m_b1 = 0.f;
+    m_b2 = 0.f;
+    m_y1 = 0.f;
+    m_y2 = 0.f;
+}
+
+void HPF_ar::m_signal(int n, t_sample *const *in, 
+			  t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float y0;
+    float y1 = m_y1;
+    float y2 = m_y2;
+    float a0 = m_a0;
+    float b1 = m_b1;
+    float b2 = m_b2;
+
+    if (changed)
+    {
+	float pfreq = m_freq * mRadiansPerSample * 0.5;
+	
+	float C = tan(pfreq);
+	float C2 = C * C;
+	float sqrt2C = C * sqrt2;
+	float next_a0 = 1.f / (1.f + sqrt2C + C2);
+	float next_b1 = 2.f * (1.f - C2) * next_a0 ;
+	float next_b2 = -(1.f - sqrt2C + C2) * next_a0;
+
+	float a0_slope = (next_a0 - a0) * mFilterSlope;
+	float b1_slope = (next_b1 - b1) * mFilterSlope;
+	float b2_slope = (next_b2 - b2) * mFilterSlope;
+	
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 - 2.f * y1 + y2);
+	    
+	    y2 = ZXP(nin) + b1 * y0 + b2 * y1; 
+	    ZXP(nout) = a0 * (y2 - 2.f * y0 + y1);
+	    
+	    y1 = ZXP(nin) + b1 * y2 + b2 * y0; 
+	    ZXP(nout) = a0 * (y1 - 2.f * y2 + y0);
+	    
+	    a0 += a0_slope; 
+	    b1 += b1_slope; 
+	    b2 += b2_slope;
+	}
+	
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 - 2.f * y1 + y2);
+	    y2 = y1; 
+	    y1 = y0;
+	}
+	
+	m_a0 = a0;
+	m_b1 = b1;
+	m_b2 = b2;
+	changed = false;
+    }
+    else
+    {
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 - 2.f * y1 + y2);
+	    
+	    y2 = ZXP(nin) + b1 * y0 + b2 * y1; 
+	    ZXP(nout) = a0 * (y2 - 2.f * y0 + y1);
+			
+	    y1 = ZXP(nin) + b1 * y2 + b2 * y0; 
+	    ZXP(nout) = a0 * (y1 - 2.f * y2 + y0);
+	}
+
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 - 2.f * y1 + y2);
+	    y2 = y1; 
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate HPF filter */
diff --git a/sc4pd/source/LPF.cpp b/sc4pd/source/LPF.cpp
new file mode 100644
index 0000000..a11e784
--- /dev/null
+++ b/sc4pd/source/LPF.cpp
@@ -0,0 +1,180 @@
+/* sc4pd 
+   LPF~
+
+   Copyright (c) 2004 Tim Blechmann.
+
+   This code is derived from:
+	SuperCollider real time audio synthesis system
+    Copyright (c) 2002 James McCartney. All rights reserved.
+	http://www.audiosynth.com
+
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+   Based on:
+     PureData by Miller Puckette and others.
+         http://www.crca.ucsd.edu/~msp/software.html
+     FLEXT by Thomas Grill
+         http://www.parasitaere-kapazitaeten.net/ext
+     SuperCollider by James McCartney
+         http://www.audiosynth.com
+     
+   Coded while listening to: Peter Kowald & Tatsuya Nakatani: 
+                             13 Definitions of Truth
+
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ LPF~ -------------------------------*/
+
+class LPF_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(LPF_ar,sc4pd_dsp);
+    
+public:
+    LPF_ar(int argc, t_atom *argv);
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out);
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	mRadiansPerSample = sc_radianspersample();
+	mFilterSlope = sc_filterslope();
+	mFilterLoops = sc_filterloops();
+	mFilterRemain = sc_filterremain();
+    }
+
+    void m_set_freq(float f)
+    {
+	m_freq=f;
+	changed = true;
+    }
+
+private:
+    float m_y1, m_y2, m_a0, m_b1, m_b2, m_freq;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+};
+
+FLEXT_LIB_DSP_V("LPF~",LPF_ar);
+
+LPF_ar::LPF_ar(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"kfreq",m_set_freq);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    m_freq = sc_getfloatarg(Args,0);
+    changed = true;
+    
+    AddOutSignal();
+
+    m_a0 = 0.f;
+    m_b1 = 0.f;
+    m_b2 = 0.f;
+    m_y1 = 0.f;
+    m_y2 = 0.f;
+}
+
+void LPF_ar::m_signal(int n, t_sample *const *in, 
+			  t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float y0;
+    float y1 = m_y1;
+    float y2 = m_y2;
+    float a0 = m_a0;
+    float b1 = m_b1;
+    float b2 = m_b2;
+
+    if (changed)
+    {
+	float pfreq = m_freq * mRadiansPerSample * 0.5;
+	
+	float C = 1.f / tan(pfreq);
+	float C2 = C * C;
+	float sqrt2C = C * sqrt2;
+	float next_a0 = 1.f / (1.f + sqrt2C + C2);
+	float next_b1 = -2.f * (1.f - C2) * next_a0 ;
+	float next_b2 = -(1.f - sqrt2C + C2) * next_a0;
+	
+	float a0_slope = (next_a0 - a0) * mFilterSlope;
+	float b1_slope = (next_b1 - b1) * mFilterSlope;
+	float b2_slope = (next_b2 - b2) * mFilterSlope;
+	
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 + 2.f * y1 + y2);
+	    
+	    y2 = ZXP(nin) + b1 * y0 + b2 * y1; 
+	    ZXP(nout) = a0 * (y2 + 2.f * y0 + y1);
+	    
+	    y1 = ZXP(nin) + b1 * y2 + b2 * y0; 
+	    ZXP(nout) = a0 * (y1 + 2.f * y2 + y0);
+	    
+	    a0 += a0_slope; 
+	    b1 += b1_slope; 
+	    b2 += b2_slope;
+	}
+	
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 + 2.f * y1 + y2);
+	    y2 = y1; 
+	    y1 = y0;
+	}
+	
+	m_a0 = a0;
+	m_b1 = b1;
+	m_b2 = b2;
+	changed = false;
+    }
+    else
+    {
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 + 2.f * y1 + y2);
+	    
+	    y2 = ZXP(nin) + b1 * y0 + b2 * y1; 
+	    ZXP(nout) = a0 * (y2 + 2.f * y0 + y1);
+	    
+	    y1 = ZXP(nin) + b1 * y2 + b2 * y0; 
+	    ZXP(nout) = a0 * (y1 + 2.f * y2 + y0);
+	}
+
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 + 2.f * y1 + y2);
+	    y2 = y1; 
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate LPF filter */
diff --git a/sc4pd/source/RHPF.cpp b/sc4pd/source/RHPF.cpp
new file mode 100644
index 0000000..fb79d2b
--- /dev/null
+++ b/sc4pd/source/RHPF.cpp
@@ -0,0 +1,192 @@
+/* sc4pd 
+   RHPF~
+
+   Copyright (c) 2004 Tim Blechmann.
+
+   This code is derived from:
+	SuperCollider real time audio synthesis system
+    Copyright (c) 2002 James McCartney. All rights reserved.
+	http://www.audiosynth.com
+
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+   Based on:
+     PureData by Miller Puckette and others.
+         http://www.crca.ucsd.edu/~msp/software.html
+     FLEXT by Thomas Grill
+         http://www.parasitaere-kapazitaeten.net/ext
+     SuperCollider by James McCartney
+         http://www.audiosynth.com
+     
+   Coded while listening to: Peter Kowald & Tatsuya Nakatani: 
+                             13 Definitions of Truth
+
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ RHPF~ -------------------------------*/
+
+class RHPF_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(RHPF_ar,sc4pd_dsp);
+    
+public:
+    RHPF_ar(int argc, t_atom *argv);
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out);
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	mRadiansPerSample = sc_radianspersample();
+	mFilterSlope = sc_filterslope();
+	mFilterLoops = sc_filterloops();
+	mFilterRemain = sc_filterremain();
+    }
+
+    void m_set_freq(float f)
+    {
+	m_freq=f;
+	changed = true;
+    }
+
+    void m_set_rq(float f)
+    {
+	m_reson=f;
+	changed = true;
+    }
+    
+    
+private:
+    float m_y1, m_y2, m_a0, m_b1, m_b2, m_freq, m_reson;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+    FLEXT_CALLBACK_F(m_set_rq);
+};
+
+FLEXT_LIB_DSP_V("RHPF~",RHPF_ar);
+
+RHPF_ar::RHPF_ar(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"kfreq",m_set_freq);
+    FLEXT_ADDMETHOD_(0,"krq",m_set_rq);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    m_freq = sc_getfloatarg(Args,0);
+    m_reson = sc_getfloatarg(Args,1);
+    changed = true;
+    
+    AddOutSignal();
+
+    m_a0 = 0.f;
+    m_b1 = 0.f;
+    m_b2 = 0.f;
+    m_y1 = 0.f;
+    m_y2 = 0.f;
+}
+
+void RHPF_ar::m_signal(int n, t_sample *const *in, 
+			  t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float y0;
+    float y1 = m_y1;
+    float y2 = m_y2;
+    float a0 = m_a0;
+    float b1 = m_b1;
+    float b2 = m_b2;
+
+    if (changed)
+    {
+	float qres = sc_max(0.001, m_reson);
+	float pfreq = m_freq * mRadiansPerSample;
+		
+	float D = tan(pfreq * qres * 0.5);
+	float C = ((1.f-D)/(1.f+D));
+	float cosf = cos(pfreq);
+	
+	float next_b1 = (1.f + C) * cosf;	
+	float next_b2 = -C;
+	float next_a0 = (1.f + C + next_b1) * .25;
+
+	float a0_slope = (next_a0 - a0) * mFilterSlope;
+	float b1_slope = (next_b1 - b1) * mFilterSlope;
+	float b2_slope = (next_b2 - b2) * mFilterSlope;
+	
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 - 2.f * y1 + y2;
+	    
+	    y2 = a0 * ZXP(nin) + b1 * y0 + b2 * y1;
+	    ZXP(nout) = y2 - 2.f * y0 + y1;
+	    
+	    y1 = a0 * ZXP(nin) + b1 * y2 + b2 * y0;
+	    ZXP(nout) = y1 - 2.f * y2 + y0;
+	    
+	    a0 += a0_slope; 
+	    b1 += b1_slope; 
+	    b2 += b2_slope;
+	}
+	
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 - 2.f * y1 + y2;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+	
+	m_a0 = a0;
+	m_b1 = b1;
+	m_b2 = b2;
+	changed = false;
+    }
+    else
+    {
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 - 2.f * y1 + y2;
+	    
+	    y2 = a0 * ZXP(nin) + b1 * y0 + b2 * y1;
+	    ZXP(nout) = y2 - 2.f * y0 + y1;
+	    
+	    y1 = a0 * ZXP(nin) + b1 * y2 + b2 * y0;
+	    ZXP(nout) = y1 - 2.f * y2 + y0;
+	}
+
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 - 2.f * y1 + y2;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate RHPF filter */
diff --git a/sc4pd/source/RLPF.cpp b/sc4pd/source/RLPF.cpp
new file mode 100644
index 0000000..89fc46c
--- /dev/null
+++ b/sc4pd/source/RLPF.cpp
@@ -0,0 +1,192 @@
+/* sc4pd 
+   RLPF~
+
+   Copyright (c) 2004 Tim Blechmann.
+
+   This code is derived from:
+	SuperCollider real time audio synthesis system
+    Copyright (c) 2002 James McCartney. All rights reserved.
+	http://www.audiosynth.com
+
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+   Based on:
+     PureData by Miller Puckette and others.
+         http://www.crca.ucsd.edu/~msp/software.html
+     FLEXT by Thomas Grill
+         http://www.parasitaere-kapazitaeten.net/ext
+     SuperCollider by James McCartney
+         http://www.audiosynth.com
+     
+   Coded while listening to: Peter Kowald & Tatsuya Nakatani: 
+                             13 Definitions of Truth
+
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ RLPF~ -------------------------------*/
+
+class RLPF_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(RLPF_ar,sc4pd_dsp);
+    
+public:
+    RLPF_ar(int argc, t_atom *argv);
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out);
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	mRadiansPerSample = sc_radianspersample();
+	mFilterSlope = sc_filterslope();
+	mFilterLoops = sc_filterloops();
+	mFilterRemain = sc_filterremain();
+    }
+
+    void m_set_freq(float f)
+    {
+	m_freq=f;
+	changed = true;
+    }
+
+    void m_set_rq(float f)
+    {
+	m_reson=f;
+	changed = true;
+    }
+    
+    
+private:
+    float m_y1, m_y2, m_a0, m_b1, m_b2, m_freq, m_reson;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+    FLEXT_CALLBACK_F(m_set_rq);
+};
+
+FLEXT_LIB_DSP_V("RLPF~",RLPF_ar);
+
+RLPF_ar::RLPF_ar(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"kfreq",m_set_freq);
+    FLEXT_ADDMETHOD_(0,"rq",m_set_rq);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    m_freq = sc_getfloatarg(Args,0);
+    m_reson = sc_getfloatarg(Args,1);
+    changed = true;
+    
+    AddOutSignal();
+
+    m_a0 = 0.f;
+    m_b1 = 0.f;
+    m_b2 = 0.f;
+    m_y1 = 0.f;
+    m_y2 = 0.f;
+}
+
+void RLPF_ar::m_signal(int n, t_sample *const *in, 
+			  t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float y0;
+    float y1 = m_y1;
+    float y2 = m_y2;
+    float a0 = m_a0;
+    float b1 = m_b1;
+    float b2 = m_b2;
+
+    if (changed)
+    {
+	float qres = sc_max(0.001, m_reson);
+	float pfreq = m_freq * mRadiansPerSample;
+		
+	float D = tan(pfreq * qres * 0.5);
+	float C = ((1.f-D)/(1.f+D));
+	float cosf = cos(pfreq);
+	
+	float next_b1 = (1.f + C) * cosf;	
+	float next_b2 = -C;
+	float next_a0 = (1.f + C - next_b1) * .25;
+
+	float a0_slope = (next_a0 - a0) * mFilterSlope;
+	float b1_slope = (next_b1 - b1) * mFilterSlope;
+	float b2_slope = (next_b2 - b2) * mFilterSlope;
+	
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 + 2.f * y1 + y2;
+	    
+	    y2 = a0 * ZXP(nin) + b1 * y0 + b2 * y1;
+	    ZXP(nout) = y2 + 2.f * y0 + y1;
+	    
+	    y1 = a0 * ZXP(nin) + b1 * y2 + b2 * y0;
+	    ZXP(nout) = y1 + 2.f * y2 + y0;
+	    
+	    a0 += a0_slope; 
+	    b1 += b1_slope; 
+	    b2 += b2_slope;
+	}
+	
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 + 2.f * y1 + y2;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+	
+	m_a0 = a0;
+	m_b1 = b1;
+	m_b2 = b2;
+	changed = false;
+    }
+    else
+    {
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 + 2.f * y1 + y2;
+	    
+	    y2 = a0 * ZXP(nin) + b1 * y0 + b2 * y1;
+	    ZXP(nout) = y2 + 2.f * y0 + y1;
+	    
+	    y1 = a0 * ZXP(nin) + b1 * y2 + b2 * y0;
+	    ZXP(nout) = y1 + 2.f * y2 + y0;
+	}
+
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = a0 * ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y0 + 2.f * y1 + y2;
+	    y2 = y1;
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate RLPF filter */
diff --git a/sc4pd/source/SOS.cpp b/sc4pd/source/SOS.cpp
index 996833a..29aaecb 100644
--- a/sc4pd/source/SOS.cpp
+++ b/sc4pd/source/SOS.cpp
@@ -143,13 +143,13 @@ SOS_ar::SOS_ar(int argc, t_atom *argv)
     
     if(sc_ar(Args))
     {
-	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_ar));
 	AddInSignal();
 	AddInSignal();
 	AddInSignal();
 	AddInSignal();
 	AddInSignal();
 	AddInSignal();
+	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_ar));
     }
     else // if not given, use control rate
 	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_kr)); 
@@ -190,15 +190,15 @@ void SOS_ar::m_signal_ar(int n, t_sample *const *in,
 	y1 = ZXP(nin) + ZXP(b1) * y2 + ZXP(b2) * y0; 
 	ZXP(nout) = ZXP(a0) * y1 + ZXP(a1) * y2 + ZXP(a2) * y0;
     }
-
-    for (int i = 0; i!= mFilterLoops;++i)
+    
+    for (int i = 0; i!= mFilterRemain;++i)
     {
 	y0 = ZXP(nin) + ZXP(b1) * y1 + ZXP(b2) * y2; 
 	ZXP(nout) = ZXP(a0) * y0 + ZXP(a1) * y1 + ZXP(a2) * y2;
 	y2 = y1; 
 	y1 = y0;
     }
-    
+
     m_y1 = zapgremlins(y1);
     m_y2 = zapgremlins(y2);
     
@@ -243,7 +243,7 @@ void SOS_ar::m_signal_kr(int n, t_sample *const *in,
 	b2 += b2_slope;
     }
 
-    for (int i = 0; i!= mFilterLoops;++i)
+    for (int i = 0; i!= mFilterRemain;++i)
     {
 	y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
 	ZXP(nout) = a0 * y0 + a1 * y1 + a2 * y2;
diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp
index 3430ee4..f01a7ad 100644
--- a/sc4pd/source/main.cpp
+++ b/sc4pd/source/main.cpp
@@ -64,7 +64,7 @@ void sc4pd_library_setup()
 	 "AllpassL~,\n"
 	 "          AllpassC~, PitchShift~, Resonz~, OnePole(~), OneZero(~), "
 	 "TwoPole~, \n"
-	 "          TwoZero~, FOS(~), SOS~"
+	 "          TwoZero~, FOS(~), SOS~, RLPF~, RHPF~, LPF~, HPF~"
 	 "\n"
 	 );
 
@@ -249,6 +249,14 @@ void sc4pd_library_setup()
     FLEXT_SETUP(FOS_kr); 
 
     FLEXT_DSP_SETUP(SOS_ar); 
+
+    FLEXT_DSP_SETUP(RLPF_ar); 
+
+    FLEXT_DSP_SETUP(RHPF_ar); 
+
+    FLEXT_DSP_SETUP(LPF_ar); 
+
+    FLEXT_DSP_SETUP(HPF_ar); 
 }
 
 FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup);
diff --git a/sc4pd/source/support.hpp b/sc4pd/source/support.hpp
index 6b51f2b..3972c83 100644
--- a/sc4pd/source/support.hpp
+++ b/sc4pd/source/support.hpp
@@ -122,5 +122,14 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 #define SIGFUN(FUN) &thisType::FUN
 
+#undef F
+#undef D
+#undef I
+#undef L
+#undef C
+#undef V
+#undef BL
+#undef S
+
 
 #endif