[PD-cvs] externals/sc4pd/source CombL.cpp,NONE,1.1 CombN.cpp,NONE,1.1 DelayUnit.cpp,1.2,1.3 main.cpp,1.17,1.18

4 Aug 2004


      Update of /cvsroot/pure-data/externals/sc4pd/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25855/source
Modified Files:
    DelayUnit.cpp main.cpp 
Added Files:
    CombL.cpp CombN.cpp 
Log Message:
Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** main.cpp	3 Aug 2004 17:51:51 -0000	1.17
--- main.cpp	4 Aug 2004 16:43:26 -0000	1.18
***************
*** 61,65 ****
     "          Integrator(~), Decay~, Decay2~, Lag~, Lag2~, LinExp(~), "
     "DelayN~,\n"
! 	 "          DelayL~, DelayC~"
     );
--- 61,65 ----
     "          Integrator(~), Decay~, Decay2~, Lag~, Lag2~, LinExp(~), "
     "DelayN~,\n"
! 	 "          DelayL~, DelayC~, CombN~, CombL~"
     );
***************
*** 214,217 ****
--- 214,221 ----
FLEXT_DSP_SETUP(DelayC_ar); 
+ 
+     FLEXT_DSP_SETUP(CombN_ar); 
+ 
+     FLEXT_DSP_SETUP(CombL_ar); 
  }
--- NEW FILE: CombN.cpp ---
/* 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 ? */
Index: DelayUnit.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/DelayUnit.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DelayUnit.cpp	3 Aug 2004 17:51:51 -0000	1.2
--- DelayUnit.cpp	4 Aug 2004 16:43:26 -0000	1.3
***************
*** 31,36 ****
       SuperCollider by James McCartney
           http://www.audiosynth.com
!      
!    Coded while listening to:
--- 31,35 ----
       SuperCollider by James McCartney
           http://www.audiosynth.com
!         Coded while listening to:
--- NEW FILE: CombL.cpp ---
/* 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 ? */

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

[PD-cvs] externals/sc4pd/source CombL.cpp,NONE,1.1 CombN.cpp,NONE,1.1 DelayUnit.cpp,1.2,1.3 main.cpp,1.17,1.18