brf & bpf

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

6 files changed, 426 insertions, 2 deletions

diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt
index 6e6c552..3f7bdc8 100755
--- a/sc4pd/make-files.txt
+++ b/sc4pd/make-files.txt
@@ -14,4 +14,4 @@ SRCS= \
 	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 RLPF.cpp RHPF.cpp LPF.cpp \
-	HPF.cpp
+	HPF.cpp BPF.cpp BRF.cpp
diff --git a/sc4pd/pd/bpf.pd b/sc4pd/pd/bpf.pd
new file mode 100644
index 0000000..5255af9
--- /dev/null
+++ b/sc4pd/pd/bpf.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 obj 130 147 BPF~ 440 0.5;
+#X msg 271 121 krq \$1;
+#X connect 1 0 3 0;
+#X connect 2 0 5 0;
+#X connect 3 0 5 0;
+#X connect 4 0 6 0;
+#X connect 5 0 0 0;
+#X connect 5 0 0 1;
+#X connect 6 0 5 0;
diff --git a/sc4pd/pd/brf.pd b/sc4pd/pd/brf.pd
new file mode 100644
index 0000000..df92c7c
--- /dev/null
+++ b/sc4pd/pd/brf.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 krq \$1;
+#X obj 130 147 BRF~ 4440 4.3;
+#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/BPF.cpp b/sc4pd/source/BPF.cpp
new file mode 100644
index 0000000..f998dd4
--- /dev/null
+++ b/sc4pd/source/BPF.cpp
@@ -0,0 +1,190 @@
+/* sc4pd 
+   BPF~
+
+   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: Jo Kondo: Works For Piano
+
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ BPF~ -------------------------------*/
+
+class BPF_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(BPF_ar,sc4pd_dsp);
+    
+public:
+    BPF_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_bw=f;
+	changed = true;
+    }
+    
+    
+private:
+    float m_y1, m_y2, m_a0, m_b1, m_b2, m_freq, m_bw;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+    FLEXT_CALLBACK_F(m_set_rq);
+};
+
+FLEXT_LIB_DSP_V("BPF~",BPF_ar);
+
+BPF_ar::BPF_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_bw = 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 BPF_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;
+	float pbw   = m_bw   * pfreq * 0.5;
+	
+	float C = 1.f / tan(pbw);
+	float D = 2.f * cos(pfreq);
+	
+	float next_a0 = 1.f / (1.f + C);
+	float next_b1 = C * D * next_a0 ;
+	float next_b2 = (1.f - C) * 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 - y2);
+	    
+	    y2 = ZXP(nin) + b1 * y0 + b2 * y1; 
+	    ZXP(nout) = a0 * (y2 - y1);
+	    
+	    y1 = ZXP(nin) + b1 * y2 + b2 * y0; 
+	    ZXP(nout) = a0 * (y1 - 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 - 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 - y2);
+	    
+	    y2 = ZXP(nin) + b1 * y0 + b2 * y1; 
+	    ZXP(nout) = a0 * (y2 - y1);
+	    
+	    y1 = ZXP(nin) + b1 * y2 + b2 * y0; 
+	    ZXP(nout) = a0 * (y1 - y0);
+	}
+
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    y0 = ZXP(nin) + b1 * y1 + b2 * y2; 
+	    ZXP(nout) = a0 * (y0 - y2);
+	    y2 = y1; 
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate BPF filter */
diff --git a/sc4pd/source/BRF.cpp b/sc4pd/source/BRF.cpp
new file mode 100644
index 0000000..e6db680
--- /dev/null
+++ b/sc4pd/source/BRF.cpp
@@ -0,0 +1,199 @@
+/* sc4pd 
+   BRF~
+
+   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: Jo Kondo: Works For Piano
+
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ BRF~ -------------------------------*/
+
+class BRF_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(BRF_ar,sc4pd_dsp);
+    
+public:
+    BRF_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_bw=f;
+	changed = true;
+    }
+    
+    
+private:
+    float m_y1, m_y2, m_a0, m_a1, m_b2, m_freq, m_bw;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+    FLEXT_CALLBACK_F(m_set_rq);
+};
+
+FLEXT_LIB_DSP_V("BRF~",BRF_ar);
+
+BRF_ar::BRF_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_bw = sc_getfloatarg(Args,1);
+    changed = true;
+    
+    AddOutSignal();
+
+    m_a0 = 0.f;
+    m_a1 = 0.f;
+    m_b2 = 0.f;
+    m_y1 = 0.f;
+    m_y2 = 0.f;
+}
+
+void BRF_ar::m_signal(int n, t_sample *const *in, 
+			  t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float ay;
+    float y0;
+    float y1 = m_y1;
+    float y2 = m_y2;
+    float a0 = m_a0;
+    float a1 = m_a1;
+    float b2 = m_b2;
+
+    if (changed)
+    {
+	float pfreq = m_freq * mRadiansPerSample;
+	float pbw   = m_bw   * pfreq * 0.5;
+	
+	float C = tan(pbw);
+	float D = 2.f * cos(pfreq);
+	
+	float next_a0 = 1.f / (1.f + C);
+	float next_a1 = -D * next_a0;
+	float next_b2 = (1.f - C) * next_a0;
+	
+	float a0_slope = (next_a0 - a0) * mFilterSlope;
+	float a1_slope = (next_a1 - a1) * mFilterSlope;
+	float b2_slope = (next_b2 - b2) * mFilterSlope;
+	
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    ay = a1 * y1;
+	    y0 = ZXP(nin) - ay - b2 * y2;
+	    ZXP(nout) = a0 * (y0 + y2) + ay;
+	    
+	    ay = a1 * y0;
+	    y2 = ZXP(nin) - ay - b2 * y1;
+	    ZXP(nout) = a0 * (y2 + y1) + ay;
+	    
+	    ay = a1 * y2;
+	    y1 = ZXP(nin) - ay - b2 * y0; 
+	    ZXP(nout) = a0 * (y1 + y0) + ay;
+	    
+	    a0 += a0_slope; 
+	    a1 += a1_slope; 
+	    b2 += b2_slope;
+	}
+	
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    ay = a1 * y1;
+	    y0 = ZXP(nin) - ay - b2 * y2;
+	    ZXP(nout) = a0 * (y0 + y2) + ay;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+	
+	m_a0 = a0;
+	m_a1 = a1;
+	m_b2 = b2;
+	changed = false;
+    }
+    else
+    {
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    ay = a1 * y1;
+	    y0 = ZXP(nin) - ay - b2 * y2;
+	    ZXP(nout) = a0 * (y0 + y2) + ay;
+	    
+	    ay = a1 * y0;
+	    y2 = ZXP(nin) - ay - b2 * y1;
+	    ZXP(nout) = a0 * (y2 + y1) + ay;
+	    
+	    ay = a1 * y2;
+	    y1 = ZXP(nin) - ay - b2 * y0; 
+	    ZXP(nout) = a0 * (y1 + y0) + ay;
+	}
+
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    ay = a1 * y1;
+	    y0 = ZXP(nin) - ay - b2 * y2;
+	    ZXP(nout) = a0 * (y0 + y2) + ay;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate BRF filter */
diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp
index f01a7ad..6d35894 100644
--- a/sc4pd/source/main.cpp
+++ b/sc4pd/source/main.cpp
@@ -64,7 +64,8 @@ void sc4pd_library_setup()
 	 "AllpassL~,\n"
 	 "          AllpassC~, PitchShift~, Resonz~, OnePole(~), OneZero(~), "
 	 "TwoPole~, \n"
-	 "          TwoZero~, FOS(~), SOS~, RLPF~, RHPF~, LPF~, HPF~"
+	 "          TwoZero~, FOS(~), SOS~, RLPF~, RHPF~, LPF~, HPF~, BPF~, "
+	 "BRF~"
 	 "\n"
 	 );
 
@@ -257,6 +258,10 @@ void sc4pd_library_setup()
     FLEXT_DSP_SETUP(LPF_ar); 
 
     FLEXT_DSP_SETUP(HPF_ar); 
+
+    FLEXT_DSP_SETUP(BPF_ar); 
+
+    FLEXT_DSP_SETUP(BRF_ar); 
 }
 
 FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup);