*** empty log message ***

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

11 files changed, 1205 insertions, 4 deletions

diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt
index 38c790a..99913e7 100755
--- a/sc4pd/make-files.txt
+++ b/sc4pd/make-files.txt
@@ -11,4 +11,4 @@ SRCS= \
 	difsqr.cpp sumsqr.cpp sqrdif.cpp sqrsum.cpp absdif.cpp LFSaw.cpp \
 	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
+	DelayC.cpp CombN.cpp CombL.cpp
diff --git a/sc4pd/pd/combl.pd b/sc4pd/pd/combl.pd
new file mode 100644
index 0000000..b8fb0d2
--- /dev/null
+++ b/sc4pd/pd/combl.pd
@@ -0,0 +1,20 @@
+#N canvas 0 0 450 300 10;
+#X floatatom 188 40 5 0 0 0 - - -;
+#X obj 67 187 dac~;
+#X msg 185 88 delaytime \$1;
+#X obj 111 190 print~;
+#X obj 128 170 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X floatatom 316 83 5 0 0 0 - - -;
+#X msg 316 107 decaytime \$1;
+#X obj 79 57 WhiteNoise~;
+#X obj 77 138 CombL~ 1 0.001 0.2;
+#X connect 0 0 2 0;
+#X connect 2 0 8 0;
+#X connect 4 0 3 0;
+#X connect 5 0 6 0;
+#X connect 6 0 8 0;
+#X connect 7 0 8 0;
+#X connect 8 0 1 0;
+#X connect 8 0 1 1;
+#X connect 8 0 3 0;
diff --git a/sc4pd/pd/combn.pd b/sc4pd/pd/combn.pd
new file mode 100644
index 0000000..4baf6ef
--- /dev/null
+++ b/sc4pd/pd/combn.pd
@@ -0,0 +1,20 @@
+#N canvas 0 0 450 300 10;
+#X floatatom 188 40 5 0 0 0 - - -;
+#X obj 67 187 dac~;
+#X msg 185 88 delaytime \$1;
+#X obj 111 190 print~;
+#X obj 128 170 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X floatatom 316 83 5 0 0 0 - - -;
+#X msg 316 107 decaytime \$1;
+#X obj 79 57 WhiteNoise~;
+#X obj 77 138 CombN~ 1 0.001 0.2;
+#X connect 0 0 2 0;
+#X connect 2 0 8 0;
+#X connect 4 0 3 0;
+#X connect 5 0 6 0;
+#X connect 6 0 8 0;
+#X connect 7 0 8 0;
+#X connect 8 0 1 0;
+#X connect 8 0 1 1;
+#X connect 8 0 3 0;
diff --git a/sc4pd/pd/delayc.pd b/sc4pd/pd/delayc.pd
new file mode 100644
index 0000000..2f539ff
--- /dev/null
+++ b/sc4pd/pd/delayc.pd
@@ -0,0 +1,11 @@
+#N canvas 0 0 450 300 10;
+#X floatatom 188 40 5 0 0 0 - - -;
+#X obj 67 187 dac~;
+#X msg 185 88 delaytime \$1;
+#X obj 77 138 CombN~ 0.01 0.003 3;
+#X obj 79 57 Dust~ 440;
+#X connect 0 0 2 0;
+#X connect 2 0 3 0;
+#X connect 3 0 1 0;
+#X connect 3 0 1 1;
+#X connect 4 0 3 0;
diff --git a/sc4pd/pd/delayl.pd b/sc4pd/pd/delayl.pd
new file mode 100644
index 0000000..690063b
--- /dev/null
+++ b/sc4pd/pd/delayl.pd
@@ -0,0 +1,11 @@
+#N canvas 0 0 450 300 10;
+#X floatatom 188 40 5 0 0 0 - - -;
+#X obj 90 233 dac~;
+#X msg 185 88 delaytime \$1;
+#X obj 79 57 Dust~ 4;
+#X obj 77 138 DelayL~ 1 3;
+#X connect 0 0 2 0;
+#X connect 2 0 4 0;
+#X connect 3 0 1 1;
+#X connect 3 0 4 0;
+#X connect 4 0 1 0;
diff --git a/sc4pd/source/CombL.cpp b/sc4pd/source/CombL.cpp
new file mode 100644
index 0000000..9af21ae
--- /dev/null
+++ b/sc4pd/source/CombL.cpp
@@ -0,0 +1,272 @@
+/* sc4pd 
+   CombL~
+
+   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: Butcher/Charles/Doerner: The Contest Of Pleasures
+
+*/
+
+#include "sc4pd.hpp"
+#include "DelayUnit.hpp"
+
+class CombL_ar : public FeedbackDelay_ar
+{
+    FLEXT_HEADER(CombL_ar,FeedbackDelay_ar);
+
+    CombL_ar (int argc, t_atom *argv);
+    ~CombL_ar ();
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out)
+    {
+	m_signal_fun(n,in,out);
+    }
+    
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	delay_changed = decay_changed = false;
+	FeedbackDelay_Reset();
+    }
+
+    void m_delay(float f)
+    {
+	m_delaytime=f;
+	delay_changed = true;
+    }
+
+    void m_decay(float f)
+    {
+	m_decaytime=f;
+	decay_changed = true;
+    }
+
+private:
+    bool delay_changed, decay_changed;
+    DEFSIGCALL(m_signal_fun);
+    DEFSIGFUN(m_signal_);
+    DEFSIGFUN(m_signal_z);
+
+    FLEXT_CALLBACK_F(m_delay);
+    FLEXT_CALLBACK_F(m_decay);
+};
+
+FLEXT_LIB_DSP_V("CombL~",CombL_ar);
+
+CombL_ar::CombL_ar (int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"delaytime",m_delay);
+    FLEXT_ADDMETHOD_(0,"decaytime",m_decay);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    if (Args.Count() != 3)
+	{
+	    post("3 arguments are needed");
+	    return;
+	}
+    
+    m_maxdelaytime = sc_getfloatarg(Args,0);
+    m_delaytime = sc_getfloatarg(Args,1);
+    m_decaytime = sc_getfloatarg(Args,2);
+    
+    SETSIGFUN(m_signal_fun,SIGFUN(m_signal_z));
+    
+    AddOutSignal();
+}
+
+CombL_ar::~CombL_ar ()
+{
+    DelayUnit_Dtor();
+}
+
+void CombL_ar::m_signal_z(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    float feedbk = m_feedbk;
+    long mask = m_mask;
+    
+    if (delay_changed || decay_changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+	
+	float next_feedbk = CalcFeedback(m_delaytime, m_decaytime);
+	float feedbk_slope = CALCSLOPE(next_feedbk, feedbk);
+	
+	for (int i = 0; i!= n;++i)
+	{
+	    dsamp += dsamp_slope;
+	    long idsamp = (long)dsamp;
+	    float frac = dsamp - idsamp;
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    
+	    float zin = ZXP(nin);
+	    if (irdphase < 0) 
+	    {
+		dlybuf[iwrphase & mask] = zin;
+		ZXP(nout) = 0.f;
+	    } 
+	    else if (irdphaseb < 0)
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		float value = d1 - frac * d1;
+		dlybuf[iwrphase & mask] = zin + feedbk * value;
+		ZXP(nout) = value;
+	    }
+	    else
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		float d2 = dlybuf[irdphaseb & mask];
+		float value = lininterp(frac, d1, d2);
+		dlybuf[iwrphase & mask] = zin + feedbk * value;
+		ZXP(nout) = value;
+	    }
+
+	    feedbk += feedbk_slope;
+	    iwrphase++;
+	}
+	m_feedbk = feedbk;
+	m_dsamp = dsamp;
+	delay_changed = decay_changed = false;
+    }
+    else
+    {
+	long idsamp = (long)dsamp;
+	float frac = dsamp - idsamp;
+
+	for (int i = 0; i!= n;++i)
+	{
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    
+	    float zin = ZXP(nin);
+	    if (irdphase < 0) 
+	    {
+		dlybuf[iwrphase & mask] = zin;
+		ZXP(nout) = 0.f;
+	    }
+	    else if (irdphaseb < 0) 
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		float value = d1 - frac * d1;
+		dlybuf[iwrphase & mask] = zin + feedbk * value;
+		ZXP(nout) = value;
+	    } 
+	    else
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		float d2 = dlybuf[irdphaseb & mask];
+		float value = lininterp(frac, d1, d2);
+		dlybuf[iwrphase & mask] = zin + feedbk * value;
+		ZXP(nout) = value;
+	    }
+	    iwrphase++;
+	}
+
+
+    }
+    
+    m_iwrphase = iwrphase;
+    m_numoutput += n;
+    if (m_numoutput >= m_idelaylen)
+    {
+	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_));
+    }
+}
+
+void CombL_ar::m_signal_(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    float feedbk = m_feedbk;
+    long mask = m_mask;
+
+    if(delay_changed || decay_changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+	
+	float next_feedbk = CalcFeedback(m_delaytime, m_decaytime);
+	float feedbk_slope = CALCSLOPE(next_feedbk, feedbk);
+
+	for(int i=0; i!= n;++i)
+	{
+	    dsamp += dsamp_slope;
+	    long idsamp = (long)dsamp;
+	    float frac = dsamp - idsamp;
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    float d1 = dlybuf[irdphase & mask];
+	    float d2 = dlybuf[irdphaseb & mask];
+	    float value = lininterp(frac, d1, d2);
+	    dlybuf[iwrphase & mask] = ZXP(nin) + feedbk * value;
+	    ZXP(nout) = value;
+	    feedbk += feedbk_slope;
+	    iwrphase++;
+	}
+	m_feedbk = feedbk;
+	m_dsamp = dsamp;
+	delay_changed = decay_changed = false;
+    }
+    else
+    {
+	long idsamp = (long)dsamp;
+	float frac = dsamp - idsamp;
+	
+	for(int i=0; i!= n;++i)
+	{
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    float d1 = dlybuf[irdphase & mask];
+	    float d2 = dlybuf[irdphaseb & mask];
+	    float value = lininterp(frac, d1, d2);
+	    dlybuf[iwrphase & mask] = ZXP(nin) + feedbk * value;
+	    ZXP(nout) = value;
+	    iwrphase++;
+	    
+	}
+    }
+    m_iwrphase = iwrphase;
+}
+
+/* todo: CombL for control rate ? */
diff --git a/sc4pd/source/CombN.cpp b/sc4pd/source/CombN.cpp
new file mode 100644
index 0000000..9c6f33e
--- /dev/null
+++ b/sc4pd/source/CombN.cpp
@@ -0,0 +1,341 @@
+/* sc4pd 
+   CombN~
+
+   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: Keith Rowe & John Tilbury: Duos For Doris
+
+*/
+
+#include "sc4pd.hpp"
+#include "DelayUnit.hpp"
+
+class CombN_ar : public FeedbackDelay_ar
+{
+    FLEXT_HEADER(CombN_ar,FeedbackDelay_ar);
+
+    CombN_ar (int argc, t_atom *argv);
+    ~CombN_ar ();
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out)
+    {
+	m_signal_fun(n,in,out);
+    }
+    
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	delay_changed = decay_changed = false;
+	FeedbackDelay_Reset();
+    }
+
+    void m_delay(float f)
+    {
+	m_delaytime=f;
+	delay_changed = true;
+    }
+
+    void m_decay(float f)
+    {
+	m_decaytime=f;
+	decay_changed = true;
+    }
+
+private:
+    bool delay_changed, decay_changed;
+    DEFSIGCALL(m_signal_fun);
+    DEFSIGFUN(m_signal_);
+    DEFSIGFUN(m_signal_z);
+
+    FLEXT_CALLBACK_F(m_delay);
+    FLEXT_CALLBACK_F(m_decay);
+};
+
+FLEXT_LIB_DSP_V("CombN~",CombN_ar);
+
+CombN_ar::CombN_ar (int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"delaytime",m_delay);
+    FLEXT_ADDMETHOD_(0,"decaytime",m_decay);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    if (Args.Count() != 3)
+	{
+	    post("3 arguments are needed");
+	    return;
+	}
+    
+    m_maxdelaytime = sc_getfloatarg(Args,0);
+    m_delaytime = sc_getfloatarg(Args,1);
+    m_decaytime = sc_getfloatarg(Args,2);
+    
+    SETSIGFUN(m_signal_fun,SIGFUN(m_signal_z));
+    
+    AddOutSignal();
+}
+
+CombN_ar::~CombN_ar ()
+{
+    DelayUnit_Dtor();
+}
+
+void CombN_ar::m_signal_z(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    float feedbk = m_feedbk;
+    long mask = m_mask;
+    
+    if (delay_changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+	
+	float next_feedbk = CalcFeedback(m_delaytime, m_decaytime);
+	float feedbk_slope = CALCSLOPE(next_feedbk, feedbk);
+	
+	for (int i = 0; i!= n;++i)
+	{
+	    dsamp += dsamp_slope;
+	    long irdphase = iwrphase - (long)dsamp;
+	    
+	    if (irdphase < 0) 
+	    {
+		dlybuf[iwrphase & mask] = ZXP(nin);
+		ZXP(nout) = 0.f;
+	    } 
+	    else
+	    {
+		float value = dlybuf[irdphase & mask];
+		dlybuf[iwrphase & mask] = ZXP(nin) + feedbk * value;
+		ZXP(nout) = value;
+	    }
+	    feedbk += feedbk_slope;
+	    iwrphase++;
+	}
+	m_feedbk = feedbk;
+	m_dsamp = dsamp;
+	delay_changed = decay_changed = false;
+    }
+    else
+    {
+	long irdphase = iwrphase - (long)dsamp;
+	float* dlybuf1 = dlybuf - ZOFF;
+	float* dlyN    = dlybuf1 + m_idelaylen;
+	if (decay_changed)
+	{
+	    float next_feedbk = CalcFeedback(m_delaytime, m_decaytime);
+	    float feedbk_slope = CALCSLOPE(next_feedbk, feedbk);
+	    long remain = n;
+	    while (remain) 
+	    {
+		float* dlyrd = dlybuf1 + (irdphase & mask);
+		float* dlywr = dlybuf1 + (iwrphase & mask);
+		long rdspace = dlyN - dlyrd;
+		long wrspace = dlyN - dlywr;
+		long nsmps = sc_min(rdspace, wrspace);
+		nsmps = sc_min(remain, nsmps);
+		remain -= nsmps;
+		
+		if (irdphase < 0) 
+		{
+		    feedbk += nsmps * feedbk_slope;
+		    dlyrd += nsmps;
+		    for (int i = 0; i!= nsmps;++i)
+		    {
+			ZXP(dlywr) = ZXP(nin);
+			ZXP(nout) = 0.f;
+		    }
+		}
+		else 
+		{
+		    for (int i = 0; i!= nsmps;++i)
+		    {
+			float value = ZXP(dlyrd);
+			ZXP(dlywr) = value * feedbk + ZXP(nin);
+			ZXP(nout) = value;
+			feedbk += feedbk_slope;
+		    }
+		}
+		iwrphase += nsmps;
+		irdphase += nsmps;
+	    }
+	    m_feedbk = feedbk;
+	    decay_changed=false;
+	}
+	else
+	{
+	    long remain = n;
+	    while (remain) 
+	    {
+		float* dlywr = dlybuf1 + (iwrphase & mask);
+		float* dlyrd = dlybuf1 + (irdphase & mask);
+		long rdspace = dlyN - dlyrd;
+		long wrspace = dlyN - dlywr;
+		long nsmps = sc_min(rdspace, wrspace);
+		nsmps = sc_min(remain, nsmps);
+		remain -= nsmps;
+		if (irdphase < 0) 
+		{
+		    for (int i = 0; i!= nsmps;++i)
+		    {
+			ZXP(dlywr) = ZXP(nin);
+			ZXP(nout) = 0.f;
+		    }
+		} 
+		else 
+		{
+		    for (int i = 0; i!= nsmps;++i)
+		    {
+			float value = ZXP(dlyrd);
+			ZXP(dlywr) = value * feedbk + ZXP(nin);
+			ZXP(nout) = value;
+		    }
+		}
+		iwrphase += nsmps;
+		irdphase += nsmps;
+	    }
+	    
+	}
+    }
+    
+    m_iwrphase = iwrphase;
+    m_numoutput += n;
+    if (m_numoutput >= m_idelaylen)
+    {
+	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_));
+    }
+}
+
+void CombN_ar::m_signal_(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    float feedbk = m_feedbk;
+    long mask = m_mask;
+
+    if(delay_changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+	
+	float next_feedbk = CalcFeedback(m_delaytime, m_decaytime);
+	float feedbk_slope = CALCSLOPE(next_feedbk, feedbk);
+
+	for(int i=0; i!= n;++i)
+	{
+	    dsamp += dsamp_slope;
+	    ++iwrphase;
+	    long irdphase = iwrphase - (long)dsamp;
+	    float value = dlybuf[irdphase & mask];
+	    dlybuf[iwrphase & mask] = ZXP(nin) + feedbk * value;
+	    ZXP(nout) = value;
+	    feedbk += feedbk_slope;
+
+	}
+	m_feedbk = feedbk;
+	m_dsamp = dsamp;
+	delay_changed = decay_changed = false;
+    }
+    else
+    {
+	long irdphase = iwrphase - (long)dsamp;
+	float* dlybuf1 = dlybuf - ZOFF;
+	float* dlyrd   = dlybuf1 + (irdphase & mask);
+	float* dlywr   = dlybuf1 + (iwrphase & mask);
+	float* dlyN    = dlybuf1 + m_idelaylen;
+	
+	if(decay_changed)
+	{
+	    float next_feedbk = CalcFeedback(m_delaytime, m_decaytime);
+	    float feedbk_slope = CALCSLOPE(next_feedbk, feedbk);
+	    long remain = n;
+	    while (remain)
+	    {
+		long rdspace = dlyN - dlyrd;
+		long wrspace = dlyN - dlywr;
+		long nsmps = sc_min(rdspace, wrspace);
+		nsmps = sc_min(remain, nsmps);
+		remain -= nsmps;
+		
+		for(int i=0; i!= nsmps;++i)
+		{
+		    float value = ZXP(dlyrd);
+		    ZXP(dlywr) = value * feedbk + ZXP(nin);
+		    ZXP(nout) = value;
+		    feedbk += feedbk_slope;
+		}
+		if (dlyrd == dlyN) dlyrd = dlybuf1;
+		if (dlywr == dlyN) dlywr = dlybuf1;
+	    }
+	    m_feedbk = feedbk;
+	    decay_changed = false;
+	}
+	else
+	{
+	    long remain = n;
+	    while (remain) 
+	    {
+		long rdspace = dlyN - dlyrd;
+		long wrspace = dlyN - dlywr;
+		long nsmps = sc_min(rdspace, wrspace);
+		nsmps = sc_min(remain, nsmps);
+		remain -= nsmps;
+		
+		for (int i = 0; i!= nsmps; ++i)
+		{
+		    float value = ZXP(dlyrd);
+		    ZXP(dlywr) = value * feedbk + ZXP(nin);
+		    ZXP(nout) = value;
+		}
+		if (dlyrd == dlyN) dlyrd = dlybuf1;
+		if (dlywr == dlyN) dlywr = dlybuf1;
+	    }
+
+	}
+	iwrphase += n;
+	
+	
+    }
+    m_iwrphase = iwrphase;
+}
+
+/* todo: CombN for control rate ? */
diff --git a/sc4pd/source/DelayC.cpp b/sc4pd/source/DelayC.cpp
new file mode 100644
index 0000000..50ab366
--- /dev/null
+++ b/sc4pd/source/DelayC.cpp
@@ -0,0 +1,287 @@
+/* sc4pd 
+   DelayC~
+
+   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: Tom Cora: Halleluja, Anyway
+   
+*/
+
+#include "sc4pd.hpp"
+#include "DelayUnit.hpp"
+
+class DelayC_ar : private DelayUnit_ar
+{
+    FLEXT_HEADER(DelayC_ar,DelayUnit_ar);
+
+    DelayC_ar (int argc, t_atom *argv);
+    ~DelayC_ar ();
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out)
+    {
+	m_signal_fun(n,in,out);
+    }
+    
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	changed = false;
+	DelayUnit_Reset();
+    }
+
+    void m_set(float f)
+    {
+	m_delaytime=f;
+	changed = true;
+    }
+
+private:
+    bool changed;
+    DEFSIGCALL(m_signal_fun);
+    DEFSIGFUN(m_signal_);
+    DEFSIGFUN(m_signal_z);
+
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("DelayC~",DelayC_ar);
+
+DelayC_ar::DelayC_ar (int argc, t_atom *argv)
+{
+
+    FLEXT_ADDMETHOD_(0,"delaytime",m_set);
+
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    if (Args.Count() != 2)
+	{
+	    post("2 arguments are needed");
+	    return;
+	}
+    
+    m_delaytime = sc_getfloatarg(Args,0);
+    m_maxdelaytime = sc_getfloatarg(Args,1);
+    
+
+    SETSIGFUN(m_signal_fun,SIGFUN(m_signal_z));
+    
+    AddOutSignal();
+}
+
+DelayC_ar::~DelayC_ar ()
+{
+    DelayUnit_Dtor();
+}
+
+void DelayC_ar::m_signal_z(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    long mask = m_mask;
+    float d0, d1, d2, d3;
+
+    if (changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+
+	for (int i = 0; i!= n;++i)
+	{
+	    dsamp += dsamp_slope;
+	    long idsamp = (long)dsamp;
+	    float frac = dsamp - idsamp;
+	    long irdphase1 = iwrphase - idsamp;
+	    long irdphase2 = irdphase1 - 1;
+	    long irdphase3 = irdphase1 - 2;
+	    long irdphase0 = irdphase1 + 1;
+	    
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    if (irdphase0 < 0) 
+	    {
+		ZXP(nout) = 0.f;
+	    } 
+	    else
+	    {
+		if (irdphase1 < 0) 
+		{
+		    d1 = d2 = d3 = 0.f;
+		    d0 = dlybuf[irdphase0 & mask];
+		} 
+		else if (irdphase2 < 0) 
+		{
+		    d1 = d2 = d3 = 0.f;
+		    d0 = dlybuf[irdphase0 & mask];
+		    d1 = dlybuf[irdphase1 & mask];
+		} 
+		else if (irdphase3 < 0) 
+		{
+		    d3 = 0.f;
+		    d0 = dlybuf[irdphase0 & mask];
+		    d1 = dlybuf[irdphase1 & mask];
+		    d2 = dlybuf[irdphase2 & mask];
+		} 
+		else 
+		{
+		    d0 = dlybuf[irdphase0 & mask];
+		    d1 = dlybuf[irdphase1 & mask];
+		    d2 = dlybuf[irdphase2 & mask];
+		    d3 = dlybuf[irdphase3 & mask];
+		}
+		ZXP(nout) = cubicinterp(frac, d0, d1, d2, d3);
+	    }
+	    iwrphase++;
+	}
+	m_dsamp = dsamp;
+	changed = false;
+    }
+    else
+    {
+	long idsamp = (long)dsamp;
+	float frac = dsamp - idsamp;
+	for (int i = 0; i!= n;++i)
+	{
+	    long irdphase1 = iwrphase - idsamp;
+	    long irdphase2 = irdphase1 - 1;
+	    long irdphase3 = irdphase1 - 2;
+	    long irdphase0 = irdphase1 + 1;
+	    
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    if (irdphase0 < 0) 
+	    {
+		ZXP(nout) = 0.f;
+	    } 
+	    else 
+	    {
+		if (irdphase1 < 0) 
+		{
+		    d1 = d2 = d3 = 0.f;
+		    d0 = dlybuf[irdphase0 & mask];
+		} 
+		else if (irdphase2 < 0) 
+		{
+		    d1 = d2 = d3 = 0.f;
+		    d0 = dlybuf[irdphase0 & mask];
+		    d1 = dlybuf[irdphase1 & mask];
+		} 
+		else if (irdphase3 < 0) 
+		{
+		    d3 = 0.f;
+		    d0 = dlybuf[irdphase0 & mask];
+		    d1 = dlybuf[irdphase1 & mask];
+		    d2 = dlybuf[irdphase2 & mask];
+		} 
+		else
+		{
+		    d0 = dlybuf[irdphase0 & mask];
+		    d1 = dlybuf[irdphase1 & mask];
+		    d2 = dlybuf[irdphase2 & mask];
+		    d3 = dlybuf[irdphase3 & mask];
+		}
+		ZXP(nout) = cubicinterp(frac, d0, d1, d2, d3);
+	    }
+	    iwrphase++;
+	}
+    }
+    
+    m_iwrphase = iwrphase;
+
+    m_numoutput += n;
+
+    if (m_numoutput >= m_idelaylen) 
+    {
+	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_));
+    }
+}
+
+void DelayC_ar::m_signal_(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    long mask = m_mask;
+
+    if (changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+	
+	for (int i = 0; i!= n;++i)
+	{
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    dsamp += dsamp_slope;
+	    long idsamp = (long)dsamp;
+	    float frac = dsamp - idsamp;
+	    long irdphase1 = iwrphase - idsamp;
+	    long irdphase2 = irdphase1 - 1;
+	    long irdphase3 = irdphase1 - 2;
+	    long irdphase0 = irdphase1 + 1;
+	    float d0 = dlybuf[irdphase0 & mask];
+	    float d1 = dlybuf[irdphase1 & mask];
+	    float d2 = dlybuf[irdphase2 & mask];
+	    float d3 = dlybuf[irdphase3 & mask];
+	    ZXP(nout) = cubicinterp(frac, d0, d1, d2, d3);
+	    iwrphase++;
+	}
+	m_dsamp = dsamp;
+	changed = false;
+    }
+    else
+    {
+	long idsamp = (long)dsamp;
+	float frac = dsamp - idsamp;
+	for (int i = 0; i!= n;++i)
+	{
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    long irdphase1 = iwrphase - idsamp;
+	    long irdphase2 = irdphase1 - 1;
+	    long irdphase3 = irdphase1 - 2;
+	    long irdphase0 = irdphase1 + 1;
+	    float d0 = dlybuf[irdphase0 & mask];
+	    float d1 = dlybuf[irdphase1 & mask];
+	    float d2 = dlybuf[irdphase2 & mask];
+	    float d3 = dlybuf[irdphase3 & mask];
+	    ZXP(nout) = cubicinterp(frac, d0, d1, d2, d3);
+	    iwrphase++;
+	}
+    }
+    m_iwrphase = iwrphase;
+}
+
+/* todo: DelayC for control rate ? */
diff --git a/sc4pd/source/DelayL.cpp b/sc4pd/source/DelayL.cpp
new file mode 100644
index 0000000..46b5458
--- /dev/null
+++ b/sc4pd/source/DelayL.cpp
@@ -0,0 +1,236 @@
+/* sc4pd 
+   DelayL~
+
+   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: Tom Cora: Halleluja, Anyway
+
+*/
+
+#include "sc4pd.hpp"
+#include "DelayUnit.hpp"
+
+class DelayL_ar : private DelayUnit_ar
+{
+    FLEXT_HEADER(DelayL_ar,DelayUnit_ar);
+
+    DelayL_ar (int argc, t_atom *argv);
+    ~DelayL_ar ();
+    
+protected:
+    virtual void m_signal(int n, t_sample *const *in, t_sample *const *out)
+    {
+	m_signal_fun(n,in,out);
+    }
+    
+    virtual void m_dsp(int n, t_sample *const *in, t_sample *const *out)
+    {
+	changed = false;
+	DelayUnit_Reset();
+    }
+
+    void m_set(float f)
+    {
+	m_delaytime=f;
+	changed = true;
+    }
+
+private:
+    bool changed;
+    DEFSIGCALL(m_signal_fun);
+    DEFSIGFUN(m_signal_);
+    DEFSIGFUN(m_signal_z);
+
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("DelayL~",DelayL_ar);
+
+DelayL_ar::DelayL_ar (int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"delaytime",m_set);
+
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    if (Args.Count() != 2)
+	{
+	    post("2 arguments are needed");
+	    return;
+	}
+    
+    m_delaytime = sc_getfloatarg(Args,0);
+    m_maxdelaytime = sc_getfloatarg(Args,1);
+    
+    SETSIGFUN(m_signal_fun,SIGFUN(m_signal_z));
+    
+    AddOutSignal();
+}
+
+DelayL_ar::~DelayL_ar ()
+{
+    DelayUnit_Dtor();
+}
+
+void DelayL_ar::m_signal_z(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+    
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    long mask = m_mask;
+
+    if (changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+
+	for (int i = 0; i!= n;++i)
+	{
+	    dsamp += dsamp_slope;
+	    long idsamp = (long)dsamp;
+	    float frac = dsamp - idsamp;
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    if (irdphase < 0) 
+	    {
+		ZXP(nout) = 0.f;
+	    }
+	    else if (irdphaseb < 0)
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		ZXP(nout) = d1 - frac * d1;
+	    }
+	    else
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		float d2 = dlybuf[irdphaseb & mask];
+		ZXP(nout) = lininterp(frac, d1, d2);
+	    }
+	    iwrphase++;
+	}
+	m_dsamp = dsamp;
+	changed = false;
+    }
+    else
+    {
+	long idsamp = (long)dsamp;
+	float frac = dsamp - idsamp;
+	for (int i = 0; i!= n;++i)
+	{
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    if (irdphase < 0) 
+	    {
+		ZXP(nout) = 0.f;
+	    } 
+	    else if (irdphaseb < 0) 
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		ZXP(nout) = d1 - frac * d1;
+	    } 
+	    else 
+	    {
+		float d1 = dlybuf[irdphase & mask];
+		float d2 = dlybuf[irdphaseb & mask];
+		ZXP(nout) = lininterp(frac, d1, d2);
+	    }
+	    iwrphase++;
+	}
+    }
+    
+    m_iwrphase = iwrphase;
+
+    m_numoutput += n;
+
+    if (m_numoutput >= m_idelaylen) 
+    {
+	SETSIGFUN(m_signal_fun,SIGFUN(m_signal_));
+    }
+}
+
+void DelayL_ar::m_signal_(int n, t_sample *const *in, t_sample *const *out)
+{
+    t_sample *nin = *in;
+    t_sample *nout = *out;
+
+    float *dlybuf = m_dlybuf;
+    long iwrphase = m_iwrphase;
+    float dsamp = m_dsamp;
+    long mask = m_mask;
+
+    if (changed)
+    {
+	float next_dsamp = CalcDelay(m_delaytime);
+	float dsamp_slope = CALCSLOPE(next_dsamp, dsamp);
+	
+	for (int i = 0; i!= n;++i)
+	{
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    dsamp += dsamp_slope;
+	    long idsamp = (long)dsamp;
+	    float frac = dsamp - idsamp;
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    float d1 = dlybuf[irdphase & mask];
+	    float d2 = dlybuf[irdphaseb & mask];
+	    ZXP(nout) = lininterp(frac, d1, d2);
+	    iwrphase++;
+	}
+	m_dsamp = dsamp;
+	changed = false;
+    }
+    else
+    {
+	long idsamp = (long)dsamp;
+	float frac = dsamp - idsamp;
+	for (int i = 0; i!= n;++i)
+	{
+	    dlybuf[iwrphase & mask] = ZXP(nin);
+	    long irdphase = iwrphase - idsamp;
+	    long irdphaseb = irdphase - 1;
+	    float d1 = dlybuf[irdphase & mask];
+	    float d2 = dlybuf[irdphaseb & mask];
+	    ZXP(nout) = lininterp(frac, d1, d2);
+	    iwrphase++;
+	}
+	
+    }
+    m_iwrphase = iwrphase;
+}
+
+/* todo: DelayL for control rate ? */
diff --git a/sc4pd/source/DelayUnit.cpp b/sc4pd/source/DelayUnit.cpp
index 5b11f96..45b05d5 100644
--- a/sc4pd/source/DelayUnit.cpp
+++ b/sc4pd/source/DelayUnit.cpp
@@ -30,8 +30,7 @@
          http://www.parasitaere-kapazitaeten.net/ext
      SuperCollider by James McCartney
          http://www.audiosynth.com
-     
-   Coded while listening to: 
+        Coded while listening to: 
 
 
 */
diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp
index 126cf50..79e67a9 100644
--- a/sc4pd/source/main.cpp
+++ b/sc4pd/source/main.cpp
@@ -60,7 +60,7 @@ void sc4pd_library_setup()
 	 "          sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n"
 	 "          Integrator(~), Decay~, Decay2~, Lag~, Lag2~, LinExp(~), "
 	 "DelayN~,\n"
-	 "          DelayL~, DelayC~"
+	 "          DelayL~, DelayC~, CombN~, CombL~"
 	 );
 
     //initialize objects
@@ -213,6 +213,10 @@ void sc4pd_library_setup()
     FLEXT_DSP_SETUP(DelayL_ar); 
 
     FLEXT_DSP_SETUP(DelayC_ar); 
+
+    FLEXT_DSP_SETUP(CombN_ar); 
+
+    FLEXT_DSP_SETUP(CombL_ar); 
 }
 
 FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup);