*** empty log message ***

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

8 files changed, 417 insertions, 6 deletions

diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt
index 475dc94..a9b154f 100755
--- a/sc4pd/make-files.txt
+++ b/sc4pd/make-files.txt
@@ -12,4 +12,5 @@ SRCS= \
 	LFPulse.cpp Impulse.cpp Integrator.cpp Decay.cpp Decay2.cpp Lag.cpp \
 	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
+	AllpassC.cpp PitchShift.cpp Resonz.cpp OnePole.cpp OneZero.cpp \
+	TwoPole.cpp
diff --git a/sc4pd/pd/onezero.pd b/sc4pd/pd/onezero.pd
new file mode 100644
index 0000000..2d68a0b
--- /dev/null
+++ b/sc4pd/pd/onezero.pd
@@ -0,0 +1,21 @@
+#N canvas 0 0 450 300 10;
+#X obj 12 159 dac~;
+#X obj 89 131 print~;
+#X obj 144 112 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X floatatom 112 20 5 0 0 0 - - -;
+#X floatatom 265 37 9 0 0 0 - - -;
+#X floatatom 266 110 9 0 0 0 - - -;
+#X obj 18 28 WhiteNoise~;
+#X msg 89 60 coef \$1;
+#X obj 18 86 OneZero~ 0.3;
+#X obj 266 78 OneZero 0.3;
+#X connect 2 0 1 0;
+#X connect 3 0 7 0;
+#X connect 4 0 9 0;
+#X connect 6 0 8 0;
+#X connect 7 0 8 0;
+#X connect 8 0 1 0;
+#X connect 8 0 0 0;
+#X connect 8 0 0 1;
+#X connect 9 0 5 0;
diff --git a/sc4pd/pd/twopole.pd b/sc4pd/pd/twopole.pd
new file mode 100644
index 0000000..b781655
--- /dev/null
+++ b/sc4pd/pd/twopole.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 obj 130 147 TwoPole~ 440 0.5;
+#X msg 201 121 kfreq \$1;
+#X floatatom 294 81 5 0 0 0 - - -;
+#X msg 271 121 kradius \$1;
+#X connect 1 0 4 0;
+#X connect 2 0 3 0;
+#X connect 3 0 0 0;
+#X connect 3 0 0 1;
+#X connect 4 0 3 0;
+#X connect 5 0 6 0;
+#X connect 6 0 3 0;
diff --git a/sc4pd/source/OnePole.cpp b/sc4pd/source/OnePole.cpp
index 310bf54..3de6ef4 100644
--- a/sc4pd/source/OnePole.cpp
+++ b/sc4pd/source/OnePole.cpp
@@ -31,7 +31,7 @@
      SuperCollider by James McCartney
          http://www.audiosynth.com
      
-   Coded while listening to: 
+   Coded while listening to: Goh Lee Kwang: Internal Pleasures
    
 */
 
@@ -240,6 +240,6 @@ OnePole_kr::OnePole_kr(int argc, t_atom *argv)
 
 void OnePole_kr::m_perform(float f)
 {
-    m_y1= f + m_b1 * (m_y1 - f);
+    m_y1= ((1-abs(m_b1))*f)+m_b1*m_y1;
     ToOutFloat(0,m_y1);
 }
diff --git a/sc4pd/source/OneZero.cpp b/sc4pd/source/OneZero.cpp
new file mode 100644
index 0000000..82c9ad5
--- /dev/null
+++ b/sc4pd/source/OneZero.cpp
@@ -0,0 +1,200 @@
+/* sc4pd 
+   OneZero, OneZero~
+
+   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: Goh Lee Kwang: Internal Pleasures
+   
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ OneZero~ -------------------------------*/
+
+class OneZero_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(OneZero_ar,sc4pd_dsp);
+    
+public:
+    OneZero_ar(int argc, t_atom *argv);
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out);
+
+    void m_set(float f)
+    {
+	n_b1=f;
+	changed = true;
+    }
+    
+private:
+    float m_b1, m_x1;
+    float n_b1;
+    bool changed;
+    
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("OneZero~",OneZero_ar);
+
+OneZero_ar::OneZero_ar(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"coef",m_set);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    m_b1 = sc_getfloatarg(Args,0);
+    
+    AddOutSignal();
+    
+    m_x1 = 0.f;
+}    
+
+void OneZero_ar::m_signal(int n, t_sample *const *in, 
+			  t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float b1 = m_b1;
+    float x1 = m_x1;
+
+    if (changed)
+    {
+	m_b1=n_b1;
+	float b1_slope = CALCSLOPE(m_b1, b1);
+	if (b1 >= 0.f && m_b1 >= 0) 
+	{
+	    for (int i = 0; i!= n;++i)
+	    {
+		float x0 = ZXP(nin); 
+		ZXP(nout) = x0 + b1 * (x1 - x0);
+		x1 = x0;
+		b1 += b1_slope;
+	    }
+	} 
+	else if (b1 <= 0.f && m_b1 <= 0) 
+	{
+	    for (int i = 0; i!= n;++i)
+	    {
+		float x0 = ZXP(nin); 
+		ZXP(nout) = x0 + b1 * (x1 + x0);
+		x1 = x0;
+		b1 += b1_slope;
+	    }
+	}
+	else
+	{
+	    for (int i = 0; i!= n;++i)
+	    {
+		float x0 = ZXP(nin); 
+		ZXP(nout) = (1.f - fabs(b1)) * x0 + b1 * x1;
+		x1 = x0;
+		b1 += b1_slope;
+	    }
+	}
+	changed = false;
+    }
+    else
+    {
+	if (b1 >= 0.f) 
+	{
+	    for (int i = 0; i!= n;++i)
+	    {
+		float x0 = ZXP(nin); 
+		ZXP(nout) = x0 + b1 * (x1 - x0);
+		x1 = x0;
+	    }
+	}
+	else
+	{
+	    for (int i = 0; i!= n;++i)
+	    {
+		float x0 = ZXP(nin); 
+		ZXP(nout) = x0 + b1 * (x1 + x0);
+		x1 = x0;
+	    }
+	}
+    }
+    m_x1 = x1;
+}
+
+/* ------------------------ OneZero ---------------------------------*/
+
+
+class OneZero_kr:
+    public flext_base
+{
+    FLEXT_HEADER(OneZero_kr,flext_base);
+
+public:
+    OneZero_kr(int argc, t_atom *argv);
+    
+protected:
+    void m_perform(float f);
+
+    void m_set(float f)
+    {
+	m_b1=f;
+    }
+
+private:
+    float m_b1, m_x1;
+
+    FLEXT_CALLBACK_F(m_set);
+    FLEXT_CALLBACK_F(m_perform);
+};
+
+
+FLEXT_LIB_V("OneZero",OneZero_kr);
+
+OneZero_kr::OneZero_kr(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD(0,m_perform);
+    FLEXT_ADDMETHOD_(0,"set",m_set);
+    
+    AddOutFloat();
+
+    //parse arguments
+    AtomList Args(argc,argv);
+
+    m_b1 = sc_getfloatarg(Args,0);
+    
+    m_x1=0;
+}
+
+void OneZero_kr::m_perform(float f)
+{
+    ToOutFloat(0,((1-abs(m_b1))*f)+m_b1*m_x1);
+    m_x1=f;
+}
diff --git a/sc4pd/source/TwoPole.cpp b/sc4pd/source/TwoPole.cpp
new file mode 100644
index 0000000..b37d17f
--- /dev/null
+++ b/sc4pd/source/TwoPole.cpp
@@ -0,0 +1,167 @@
+/* sc4pd 
+   TwoPole~
+
+   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: VA: Insight
+   
+*/
+
+#include "sc4pd.hpp"
+
+/* ------------------------ TwoPole~ -------------------------------*/
+
+class TwoPole_ar:
+    public sc4pd_dsp
+{
+    FLEXT_HEADER(TwoPole_ar,sc4pd_dsp);
+    
+public:
+    TwoPole_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_radius(float f)
+    {
+	m_reson=f;
+	changed = true;
+    }
+    
+    
+private:
+    float m_b1, m_b2, m_y1, m_y2, m_freq, m_reson;
+    bool changed;
+    float mRadiansPerSample, mFilterSlope;
+    int mFilterLoops, mFilterRemain; 
+    
+    FLEXT_CALLBACK_F(m_set_freq);
+    FLEXT_CALLBACK_F(m_set_radius);
+};
+
+FLEXT_LIB_DSP_V("TwoPole~",TwoPole_ar);
+
+TwoPole_ar::TwoPole_ar(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"kfreq",m_set_freq);
+    FLEXT_ADDMETHOD_(0,"kradius",m_set_radius);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    m_freq = sc_getfloatarg(Args,0);
+    m_reson = sc_getfloatarg(Args,1);
+    changed = false;
+    
+    AddOutSignal();
+    
+    m_b1 = 0.f;
+    m_b2 = 0.f;
+    m_y1 = 0.f;
+    m_y2 = 0.f;
+}
+
+void TwoPole_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;
+
+    if (changed)
+    {
+	float b1 = m_b1;
+	float b2 = m_b2;
+	float b1_next = 2.f * m_reson * cos(m_freq * mRadiansPerSample);
+	float b2_next = -(m_reson * m_reson);
+	float b1_slope = (b1_next - b1) * mFilterSlope;
+	float b2_slope = (b2_next - b2) * mFilterSlope;
+	
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    ZXP(nout) = y0 = ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y2 = ZXP(nin) + b1 * y0 + b2 * y1;
+	    ZXP(nout) = y1 = ZXP(nin) + b1 * y2 + b2 * y0;
+	    
+	    b1 += b1_slope; 
+	    b2 += b2_slope;
+	}
+	
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    ZXP(nout) = y0 = ZXP(nin) + b1 * y1 + b2 * y2;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+
+	m_b1 = b1;
+	m_b2 = b2;
+	changed = false;
+    }
+    else
+    {
+	float b1 = m_b1;
+	float b2 = m_b2;
+
+	for (int i = 0; i!= mFilterLoops;++i)
+	{
+	    ZXP(nout) = y0 = ZXP(nin) + b1 * y1 + b2 * y2;
+	    ZXP(nout) = y2 = ZXP(nin) + b1 * y0 + b2 * y1;
+	    ZXP(nout) = y1 = ZXP(nin) + b1 * y2 + b2 * y0;
+	}
+	for (int i = 0; i!= mFilterRemain;++i)
+	{
+	    ZXP(nout) = y0 = ZXP(nin) + b1 * y1 + b2 * y2;
+	    y2 = y1; 
+	    y1 = y0;
+	}
+    }
+    m_y1 = zapgremlins(y1);
+    m_y2 = zapgremlins(y2);
+}
+
+/* no control rate two pole filter */
diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp
index 8f0eafa..2cac635 100644
--- a/sc4pd/source/main.cpp
+++ b/sc4pd/source/main.cpp
@@ -62,7 +62,9 @@ void sc4pd_library_setup()
 	 "DelayN~,\n"
 	 "          DelayL~, DelayC~, CombN~, CombL~, CombC~, AllpassN~, "
 	 "AllpassL~,\n"
-	 "          AllpassC~, PitchShift~, Resonz~, OnePole(~)"
+	 "          AllpassC~, PitchShift~, Resonz~, OnePole(~), OneZero(~)"
+	 "TwoPole~"
+
 	 "\n"
 	 );
 
@@ -235,6 +237,11 @@ void sc4pd_library_setup()
 
     FLEXT_DSP_SETUP(OnePole_ar); 
     FLEXT_SETUP(OnePole_kr); 
+
+    FLEXT_DSP_SETUP(OneZero_ar); 
+    FLEXT_SETUP(OneZero_kr); 
+
+    FLEXT_DSP_SETUP(TwoPole_ar); 
 }
 
 FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup);
diff --git a/sc4pd/source/sc4pd.hpp b/sc4pd/source/sc4pd.hpp
index eacbfff..f80b177 100644
--- a/sc4pd/source/sc4pd.hpp
+++ b/sc4pd/source/sc4pd.hpp
@@ -102,12 +102,12 @@ class sc4pd_dsp
 	return 1 / Blocksize();
     }
     
-    inline float sc_filterloops()
+    inline int sc_filterloops()
     {
 	return Blocksize() / 3;
     }
     
-    inline float sc_filterremain()
+    inline int sc_filterremain()
     {
 	return Blocksize() % 3;
     }