Pd-cvs August 2004

pd-cvs@lists.iem.at

10 participants
171 discussions

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
by Tim Blechmann 04 Aug '04

04 Aug '04

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 ? */

1 0

externals/sc4pd make-files.txt,1.15,1.16
by Tim Blechmann 04 Aug '04

04 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25855 Modified Files: make-files.txt Log Message: Index: make-files.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/make-files.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** make-files.txt 3 Aug 2004 17:51:50 -0000 1.15 --- make-files.txt 4 Aug 2004 16:43:25 -0000 1.16 *************** *** 12,14 **** 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 --- 12,14 ---- 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

1 0

externals/sc4pd/pd combn.pd,NONE,1.1
by Tim Blechmann 04 Aug '04

04 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25855/pd Added Files: combn.pd Log Message: --- NEW FILE: combn.pd --- #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;

1 0

externals/sc4pd/source DelayN.cpp,1.1,1.2 DelayUnit.cpp,1.1,1.2 DelayUnit.hpp,1.1,1.2 main.cpp,1.16,1.17 support.hpp,1.6,1.7
by Tim Blechmann 03 Aug '04

03 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5454/source Modified Files: DelayN.cpp DelayUnit.cpp DelayUnit.hpp main.cpp support.hpp Log Message: small changes Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** main.cpp 3 Aug 2004 09:56:19 -0000 1.16 --- main.cpp 3 Aug 2004 17:51:51 -0000 1.17 *************** *** 59,64 **** "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" ! " Integrator(~), Decay~, Decay2~, Lag~, Lag2~, LinExp(~)" ! "DelayN~\n" ); --- 59,65 ---- "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" ! " Integrator(~), Decay~, Decay2~, Lag~, Lag2~, LinExp(~), " ! "DelayN~,\n" ! " DelayL~, DelayC~" ); *************** *** 209,212 **** --- 210,217 ---- FLEXT_DSP_SETUP(DelayN_ar); + + FLEXT_DSP_SETUP(DelayL_ar); + + FLEXT_DSP_SETUP(DelayC_ar); } Index: support.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/support.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** support.hpp 2 Aug 2004 19:18:22 -0000 1.6 --- support.hpp 3 Aug 2004 17:51:51 -0000 1.7 *************** *** 35,48 **** */ #include <flext.h> - //#include <flsupport.h> #include "SC_PlugIn.h" - //#include <strings.h> #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) #error You need at least FLEXT version 0.4.6 #endif /* for argument parsing */ bool sc_add (flext::AtomList a); --- 35,50 ---- */ + #ifndef _SUPPORT_HPP + #define _SUPPORT_HPP + #include <flext.h> #include "SC_PlugIn.h" #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) #error You need at least FLEXT version 0.4.6 #endif + /* for argument parsing */ bool sc_add (flext::AtomList a); *************** *** 66,69 **** --- 68,97 ---- int32 timeseed(); + /* cubic interpolation from DelayUGens.cpp */ + inline float cubicinterp(float x, float y0, float y1, float y2, float y3) + { + // 4-point, 3rd-order Hermite (x-form) + float c0 = y1; + float c1 = 0.5f * (y2 - y0); + float c2 = y0 - 2.5f * y1 + 2.f * y2 - 0.5f * y3; + float c3 = 0.5f * (y3 - y0) + 1.5f * (y1 - y2); + + return ((c3 * x + c2) * x + c1) * x + c0; + } + + /* feedback calculation from DelayUGens.cpp */ + inline float CalcFeedback(float delaytime, float decaytime) + { + if (delaytime == 0.f) { + return 0.f; + } else if (decaytime > 0.f) { + return exp(log001 * delaytime / decaytime); + } else if (decaytime < 0.f) { + return -exp(log001 * delaytime / -decaytime); + } else { + return 0.f; + } + } + /* this is copied from thomas grill's xsample: *************** *** 96,97 **** --- 124,126 ---- + #endif Index: DelayUnit.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/DelayUnit.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DelayUnit.cpp 3 Aug 2004 09:56:19 -0000 1.1 --- DelayUnit.cpp 3 Aug 2004 17:51:51 -0000 1.2 *************** *** 47,51 **** m_fdelaylen = m_idelaylen = delaybufsize; ! delete m_dlybuf; m_dlybuf = new float[delaybufsize] ; m_mask = delaybufsize - 1; --- 47,51 ---- m_fdelaylen = m_idelaylen = delaybufsize; ! delete[] m_dlybuf; m_dlybuf = new float[delaybufsize] ; m_mask = delaybufsize - 1; *************** *** 54,70 **** void DelayUnit_ar::DelayUnit_Dtor() { ! delete m_dlybuf; } float DelayUnit_ar::CalcDelay(float delaytime) { ! float next_dsamp = delaytime * Samplerate(); ! return sc_clip(next_dsamp, 1.f, m_fdelaylen); } ! void DelayUnit_ar::DelayUnit_Reset(float f, float g) { - m_maxdelaytime = f; - m_delaytime = g; m_dlybuf = 0; --- 54,68 ---- void DelayUnit_ar::DelayUnit_Dtor() { ! delete[] m_dlybuf; } float DelayUnit_ar::CalcDelay(float delaytime) { ! float next_dsamp = delaytime * Samplerate(); ! return sc_clip(next_dsamp, 1.f, m_fdelaylen); } ! void DelayUnit_ar::DelayUnit_Reset() { m_dlybuf = 0; *************** *** 76,77 **** --- 74,82 ---- m_iwrphase = 0; } + + void FeedbackDelay_ar::FeedbackDelay_Reset() + { + DelayUnit_Reset(); + + m_feedbk = CalcFeedback(m_delaytime, m_decaytime); + } Index: DelayN.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/DelayN.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DelayN.cpp 3 Aug 2004 09:56:19 -0000 1.1 --- DelayN.cpp 3 Aug 2004 17:51:50 -0000 1.2 *************** *** 33,37 **** Coded while listening to: ! */ --- 33,37 ---- Coded while listening to: ! */ *************** *** 55,60 **** { changed = false; ! DelayUnit_Reset(m_maxdelaytime, m_delaytime); ! post("start"); } --- 55,59 ---- { changed = false; ! DelayUnit_Reset(); } Index: DelayUnit.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/DelayUnit.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DelayUnit.hpp 3 Aug 2004 09:56:19 -0000 1.1 --- DelayUnit.hpp 3 Aug 2004 17:51:51 -0000 1.2 *************** *** 44,48 **** /* functions */ void DelayUnit_AllocDelayLine(); ! void DelayUnit_Reset(float maxdelaytime, float delaytime); float CalcDelay(float delaytime); void DelayUnit_Dtor(); --- 44,48 ---- /* functions */ void DelayUnit_AllocDelayLine(); ! void DelayUnit_Reset(); float CalcDelay(float delaytime); void DelayUnit_Dtor(); *************** *** 57,58 **** --- 57,65 ---- /* todo: a delay for control messages? */ + + class FeedbackDelay_ar : public DelayUnit_ar + { + FLEXT_HEADER(FeedbackDelay_ar,DelayUnit_ar); + float m_feedbk, m_decaytime; + void FeedbackDelay_Reset(); + };

1 0

externals/sc4pd config-pd-linux.txt,1.4,1.5 make-files.txt,1.14,1.15
by Tim Blechmann 03 Aug '04

03 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5454 Modified Files: config-pd-linux.txt make-files.txt Log Message: small changes Index: config-pd-linux.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/config-pd-linux.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config-pd-linux.txt 3 Aug 2004 09:56:18 -0000 1.4 --- config-pd-linux.txt 3 Aug 2004 17:51:50 -0000 1.5 *************** *** 2,6 **** # your c++ compiler (if not g++) ! CXX=icc --- 2,6 ---- # your c++ compiler (if not g++) ! # CXX=icc Index: make-files.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/make-files.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** make-files.txt 3 Aug 2004 09:56:19 -0000 1.14 --- make-files.txt 3 Aug 2004 17:51:50 -0000 1.15 *************** *** 11,13 **** 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 \ No newline at end of file --- 11,14 ---- 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

1 0

externals/sc4pd/source DelayN.cpp,NONE,1.1 DelayUnit.cpp,NONE,1.1 DelayUnit.hpp,NONE,1.1 Lag2.cpp,NONE,1.1 Lag3.cpp,NONE,1.1 LinExp.cpp,NONE,1.1 main.cpp,1.15,1.16 sc4pd.hpp,1.2,1.3 template.cpp,1.1.1.1,1.2
by Tim Blechmann 03 Aug '04

03 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/source Modified Files: main.cpp sc4pd.hpp template.cpp Added Files: DelayN.cpp DelayUnit.cpp DelayUnit.hpp Lag2.cpp Lag3.cpp LinExp.cpp Log Message: works of one morning Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main.cpp 2 Aug 2004 21:13:50 -0000 1.15 --- main.cpp 3 Aug 2004 09:56:19 -0000 1.16 *************** *** 59,63 **** "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" ! " Integrator(~), Decay~, Decay2~, Lag~\n" ); --- 59,64 ---- "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" ! " Integrator(~), Decay~, Decay2~, Lag~, Lag2~, LinExp(~)" ! "DelayN~\n" ); *************** *** 199,202 **** --- 200,212 ---- FLEXT_DSP_SETUP(Lag_ar); + + FLEXT_DSP_SETUP(Lag2_ar); + + FLEXT_DSP_SETUP(Lag3_ar); + + FLEXT_DSP_SETUP(LinExp_ar); + FLEXT_SETUP(LinExp_kr); + + FLEXT_DSP_SETUP(DelayN_ar); } --- NEW FILE: DelayUnit.cpp --- /* sc4pd public class for several delay objects 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: */ #include "sc4pd.hpp" #include "DelayUnit.hpp" void DelayUnit_ar::DelayUnit_AllocDelayLine() { long delaybufsize = (long)ceil(m_maxdelaytime * Samplerate() + 1.f); delaybufsize = delaybufsize + Blocksize(); delaybufsize = NEXTPOWEROFTWO(delaybufsize); // round up to next power of two m_fdelaylen = m_idelaylen = delaybufsize; delete m_dlybuf; m_dlybuf = new float[delaybufsize] ; m_mask = delaybufsize - 1; } void DelayUnit_ar::DelayUnit_Dtor() { delete m_dlybuf; } float DelayUnit_ar::CalcDelay(float delaytime) { float next_dsamp = delaytime * Samplerate(); return sc_clip(next_dsamp, 1.f, m_fdelaylen); } void DelayUnit_ar::DelayUnit_Reset(float f, float g) { m_maxdelaytime = f; m_delaytime = g; m_dlybuf = 0; DelayUnit_AllocDelayLine(); m_dsamp = CalcDelay(m_delaytime); m_numoutput = 0; m_iwrphase = 0; } Index: template.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/template.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** template.cpp 14 Jul 2004 16:21:44 -0000 1.1.1.1 --- template.cpp 3 Aug 2004 09:56:19 -0000 1.2 *************** *** 35,43 **** */ ! #include <flext.h> ! ! #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) ! #error You need at least FLEXT version 0.4.6 ! #endif ! ! --- 35,37 ---- */ ! #include "sc4pd.hpp" Index: sc4pd.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/sc4pd.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sc4pd.hpp 2 Aug 2004 21:13:50 -0000 1.2 --- sc4pd.hpp 3 Aug 2004 09:56:19 -0000 1.3 *************** *** 35,38 **** --- 35,41 ---- */ + #ifndef _SC4PD_HPP + #define _SC$PD_HPP + #include <flext.h> *************** *** 52,55 **** --- 55,69 ---- + + //#define SAMPLERATE (unit->mRate->mSampleRate) + #undef SAMPLERATE + #define SAMPLERATE Samplerate() + + //#define BUFLENGTH (unit->mBufLength) + #undef BUFLENGTH + #define BUFLENGTH Blocksize() + + + /* to make sure the behaviour is consistent: */ *************** *** 57,58 **** --- 71,77 ---- #define ZXP(z) (*(z)++) + + + + + #endif --- NEW FILE: Lag2.cpp --- /* sc4pd Lag2~, Lag2 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: DKV Trio: Baraka */ #include "sc4pd.hpp" /* ------------------------ Lag2~ -----------------------------*/ class Lag2_ar :public flext_dsp { FLEXT_HEADER(Lag2_ar,flext_dsp); public: Lag2_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); void m_set(float f); private: FLEXT_CALLBACK_F(m_set); float m_b1, n_b1; float m_y1a, m_y1b; float m_lag; bool changed; }; FLEXT_LIB_DSP_V("Lag2~",Lag2_ar); Lag2_ar::Lag2_ar(int argc,t_atom * argv) { FLEXT_ADDMETHOD_(0,"lagTime",m_set); AtomList Args(argc,argv); m_lag = sc_getfloatarg(Args,0); AddOutSignal(); m_b1 = 0.f; m_y1a = 0.f; m_y1b = 0.f; } void Lag2_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { changed = false; m_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate())); } void Lag2_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; t_sample *nin = *in; float y1a = m_y1a; float y1b = m_y1b; float b1 = m_b1; if (changed) { float b1_slope = CALCSLOPE(m_b1, n_b1); m_b1 = n_b1; for (int i = 0; i!= n;++i) { float y0a = ZXP(nin); y1a = y0a + b1 * (y1a - y0a); y1b = y1a + b1 * (y1b - y1a); ZXP(nout) = y1b; b1 += b1_slope; } changed = false; } else { for (int i = 0; i!= n;++i) { float y0a = ZXP(nin); y1a = y0a + b1 * (y1a - y0a); y1b = y1a + b1 * (y1b - y1a); ZXP(nout) = y1b; } } m_y1a = zapgremlins(y1a); m_y1b = zapgremlins(y1b); } void Lag2_ar::m_set(float f) { m_lag = f; n_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate())); changed = true; } /* todo: does a control rate Lag2 make sense? */ --- NEW FILE: Lag3.cpp --- /* sc4pd Lag3~, Lag3 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: DKV Trio: Baraka */ #include "sc4pd.hpp" /* ------------------------ Lag3~ -----------------------------*/ class Lag3_ar :public flext_dsp { FLEXT_HEADER(Lag3_ar,flext_dsp); public: Lag3_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); void m_set(float f); private: FLEXT_CALLBACK_F(m_set); float m_b1, n_b1; float m_y1a, m_y1b,m_y1c; float m_lag; bool changed; }; FLEXT_LIB_DSP_V("Lag3~",Lag3_ar); Lag3_ar::Lag3_ar(int argc,t_atom * argv) { FLEXT_ADDMETHOD_(0,"lagTime",m_set); AtomList Args(argc,argv); m_lag = sc_getfloatarg(Args,0); AddOutSignal(); m_b1 = 0.f; m_y1a = 0.f; m_y1b = 0.f; m_y1c = 0.f; } void Lag3_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { changed = false; m_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate())); } void Lag3_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; t_sample *nin = *in; float y1a = m_y1a; float y1b = m_y1b; float y1c = m_y1c; float b1 = m_b1; if (changed) { float b1_slope = CALCSLOPE(m_b1, n_b1); m_b1 = n_b1; for (int i = 0; i!= n;++i) { float y0a = ZXP(nin); y1a = y0a + b1 * (y1a - y0a); y1b = y1a + b1 * (y1b - y1a); y1c = y1b + b1 * (y1c - y1b); ZXP(nout) = y1c; b1 += b1_slope; } changed = false; } else { for (int i = 0; i!= n;++i) { float y0a = ZXP(nin); y1a = y0a + b1 * (y1a - y0a); y1b = y1a + b1 * (y1b - y1a); y1c = y1b + b1 * (y1c - y1b); ZXP(nout) = y1c; } } m_y1a = zapgremlins(y1a); m_y1b = zapgremlins(y1b); m_y1b = zapgremlins(y1c); } void Lag3_ar::m_set(float f) { m_lag = f; n_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate())); changed = true; } /* todo: does a control rate Lag3 make sense? */ --- NEW FILE: DelayN.cpp --- /* sc4pd DelayN~ 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: */ #include "sc4pd.hpp" #include "DelayUnit.hpp" class DelayN_ar : private DelayUnit_ar { FLEXT_HEADER(DelayN_ar,DelayUnit_ar); DelayN_ar (int argc, t_atom *argv); ~DelayN_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(m_maxdelaytime, m_delaytime); post("start"); } 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("DelayN~",DelayN_ar); DelayN_ar::DelayN_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(); } DelayN_ar::~DelayN_ar () { DelayUnit_Dtor(); } void DelayN_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 irdphase = iwrphase - (long)dsamp; dlybuf[iwrphase & mask] = ZXP(nin); if (irdphase < 0) { ZXP(nout) = 0.f; } else { ZXP(nout) = dlybuf[irdphase & mask]; } iwrphase++; } m_dsamp = dsamp; changed = false; } else { long irdphase = iwrphase - (long)dsamp; float* dlybuf1 = dlybuf - ZOFF; float* dlyN = dlybuf1 + m_idelaylen; 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) { ZXP(dlywr) = ZXP(nin); ZXP(nout) = ZXP(dlyrd); } } iwrphase += nsmps; irdphase += nsmps; } } m_iwrphase = iwrphase; m_numoutput += n; if (m_numoutput >= m_idelaylen) { SETSIGFUN(m_signal_fun,SIGFUN(m_signal_)); } } void DelayN_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; ++iwrphase; long irdphase = iwrphase - (long)dsamp; ZXP(nout) = dlybuf[irdphase & mask]; } m_dsamp = dsamp; 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; 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) { ZXP(dlywr) = ZXP(nin); ZXP(nout) = ZXP(dlyrd); } if (dlyrd == dlyN) dlyrd = dlybuf1; if (dlywr == dlyN) dlywr = dlybuf1; } iwrphase += n; } m_iwrphase = iwrphase; } /* todo: DelayN for control rate ? */ --- NEW FILE: DelayUnit.hpp --- /* sc4pd public class for several delay objects 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: */ #include "sc4pd.hpp" class DelayUnit_ar : public flext_dsp { FLEXT_HEADER(DelayUnit_ar, flext_dsp); public: /* functions */ void DelayUnit_AllocDelayLine(); void DelayUnit_Reset(float maxdelaytime, float delaytime); float CalcDelay(float delaytime); void DelayUnit_Dtor(); /* data */ float *m_dlybuf; float m_dsamp, m_fdelaylen; float m_delaytime, m_maxdelaytime; long m_iwrphase, m_idelaylen, m_mask; long m_numoutput; }; /* todo: a delay for control messages? */ --- NEW FILE: LinExp.cpp --- /* sc4pd LinExp~, LinExp 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: The Ex & Tom Cora - And The Weathermen Shrug Their Shoulders */ #include "sc4pd.hpp" /* ------------------------ LinExp~ -----------------------------*/ class LinExp_ar :public flext_dsp { FLEXT_HEADER(LinExp_ar,flext_dsp); public: LinExp_ar(int argc,t_atom * argv); protected: virtual void m_signal(int n, t_sample *const *in, t_sample *const *out); void m_set_srclo(float f) { m_srclo = f; m_reset(); } void m_set_srchi(float f) { m_srchi = f; m_reset(); } void m_set_dstlo(float f) { m_dstlo = f; m_reset(); } void m_set_dsthi(float f) { m_dsthi = f; m_reset(); } void m_reset() { m_dstratio = m_dsthi/m_dstlo; m_rsrcrange = 1. / (m_srchi - m_srclo); m_rrminuslo = m_rsrcrange * -m_srclo; } private: FLEXT_CALLBACK_F(m_set_srclo); FLEXT_CALLBACK_F(m_set_srchi); FLEXT_CALLBACK_F(m_set_dstlo); FLEXT_CALLBACK_F(m_set_dsthi); float m_dstratio, m_rsrcrange, m_rrminuslo, m_dstlo; float m_srclo, m_srchi, m_dsthi; //we will be able to reset the values }; FLEXT_LIB_DSP_V("LinExp~",LinExp_ar); LinExp_ar::LinExp_ar(int argc,t_atom * argv) { FLEXT_ADDMETHOD_(0,"srclo",m_set_srclo); FLEXT_ADDMETHOD_(0,"srchi",m_set_srchi); FLEXT_ADDMETHOD_(0,"dstlo",m_set_dstlo); FLEXT_ADDMETHOD_(0,"dsthi",m_set_dsthi); AtomList Args(argc,argv); if (Args.Count() != 4) post("4 arguments are required"); else { m_srclo = sc_getfloatarg(Args,0); m_srchi = sc_getfloatarg(Args,1); m_dstlo = sc_getfloatarg(Args,2); m_dsthi = sc_getfloatarg(Args,3); m_reset(); AddOutSignal(); } } void LinExp_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; t_sample *nin = *in; float dstlo = m_dstlo; float dstratio = m_dstratio; float rsrcrange = m_rsrcrange; float rrminuslo = m_rrminuslo; for (int i = 0; i!= n;++i) { ZXP(nout) = dstlo * pow(dstratio, ZXP(nin) * rsrcrange + rrminuslo); } } /* ------------------------ LinExp ------------------------------*/ class LinExp_kr :public flext_base { FLEXT_HEADER(LinExp_kr,flext_base); public: LinExp_kr(int argc,t_atom * argv); protected: void m_perform(float f); void m_set_srclo(float f) { m_srclo = f; m_reset(); } void m_set_srchi(float f) { m_srchi = f; m_reset(); } void m_set_dstlo(float f) { m_dstlo = f; m_reset(); } void m_set_dsthi(float f) { m_dsthi = f; m_reset(); } void m_reset() { m_dstratio = m_dsthi/m_dstlo; m_rsrcrange = 1. / (m_srchi - m_srclo); m_rrminuslo = m_rsrcrange * -m_srclo; } private: FLEXT_CALLBACK_F(m_set_srclo); FLEXT_CALLBACK_F(m_set_srchi); FLEXT_CALLBACK_F(m_set_dstlo); FLEXT_CALLBACK_F(m_set_dsthi); float m_dstratio, m_rsrcrange, m_rrminuslo, m_dstlo; float m_srclo, m_srchi, m_dsthi; //we will be able to reset the values FLEXT_CALLBACK_F(m_perform); }; FLEXT_LIB_V("LinExp",LinExp_kr); LinExp_kr::LinExp_kr(int argc,t_atom * argv) { FLEXT_ADDMETHOD(0,m_perform); FLEXT_ADDMETHOD_(0,"srclo",m_set_srclo); FLEXT_ADDMETHOD_(0,"srchi",m_set_srchi); FLEXT_ADDMETHOD_(0,"dstlo",m_set_dstlo); FLEXT_ADDMETHOD_(0,"dsthi",m_set_dsthi); AtomList Args(argc,argv); if (Args.Count() != 4) post("4 arguments are required"); else { m_srclo = sc_getfloatarg(Args,0); m_srchi = sc_getfloatarg(Args,1); m_dstlo = sc_getfloatarg(Args,2); m_dsthi = sc_getfloatarg(Args,3); m_reset(); AddInFloat(); AddOutFloat(); } } void LinExp_kr::m_perform(float f) { ToOutFloat(0,m_dstlo * pow(m_dstratio, f * m_rsrcrange + m_rrminuslo)); }

1 0

externals/sc4pd/pd delayn.pd,NONE,1.1 lag2.pd,NONE,1.1 lag3.pd,NONE,1.1 linexp.pd,NONE,1.1
by Tim Blechmann 03 Aug '04

03 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/pd Added Files: delayn.pd lag2.pd lag3.pd linexp.pd Log Message: works of one morning --- NEW FILE: delayn.pd --- #N canvas 0 0 450 300 10; #X obj 77 138 DelayN~ 1 3; #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 connect 0 0 2 0; #X connect 1 0 3 0; #X connect 3 0 0 0; #X connect 4 0 0 0; #X connect 4 0 2 1; --- NEW FILE: linexp.pd --- #N canvas 0 0 450 300 10; #X obj 31 230 dac~; #X obj 111 223 print~; #X obj 116 196 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 27 86 osc~ 440; #X obj 27 142 LinExp~ 0 1 0.001 2; #X floatatom 252 204 5 0 0 0 - - -; #X obj 246 151 LinExp 0 100 0.001 2; #X floatatom 248 123 5 0 0 0 - - -; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 0 0; #X connect 4 0 0 1; #X connect 4 0 1 0; #X connect 6 0 5 0; #X connect 7 0 6 0; --- NEW FILE: lag2.pd --- #N canvas 0 0 450 300 10; #X obj 159 205 dac~; #X obj 239 198 print~; #X obj 244 171 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 257 82 hsl 128 15 1e-04 1 1 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 0; #X msg 254 102 lagTime \$1; #X obj 155 61 WhiteNoise~; #X obj 156 130 Lag2~ 0.0004; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 6 0; #X connect 5 0 6 0; #X connect 6 0 0 0; #X connect 6 0 0 1; #X connect 6 0 1 0; --- NEW FILE: lag3.pd --- #N canvas 0 0 450 300 10; #X obj 159 205 dac~; #X obj 239 198 print~; #X obj 244 171 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 257 82 hsl 128 15 1e-04 1 1 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 0; #X msg 254 102 lagTime \$1; #X obj 155 61 WhiteNoise~; #X obj 156 130 Lag~ 0.0004; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 6 0; #X connect 5 0 6 0; #X connect 6 0 0 0; #X connect 6 0 0 1; #X connect 6 0 1 0;

1 0

externals/sc4pd config-pd-linux.txt,1.3,1.4 make-files.txt,1.13,1.14
by Tim Blechmann 03 Aug '04

03 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302 Modified Files: config-pd-linux.txt make-files.txt Log Message: works of one morning Index: config-pd-linux.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/config-pd-linux.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config-pd-linux.txt 23 Jul 2004 10:01:55 -0000 1.3 --- config-pd-linux.txt 3 Aug 2004 09:56:18 -0000 1.4 *************** *** 2,6 **** # your c++ compiler (if not g++) ! # CXX=icc --- 2,6 ---- # your c++ compiler (if not g++) ! CXX=icc Index: make-files.txt =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/make-files.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** make-files.txt 2 Aug 2004 21:13:49 -0000 1.13 --- make-files.txt 3 Aug 2004 09:56:19 -0000 1.14 *************** *** 10,12 **** excess.cpp hypot.cpp ring1.cpp ring2.cpp ring3.cpp ring4.cpp \ difsqr.cpp sumsqr.cpp sqrdif.cpp sqrsum.cpp absdif.cpp LFSaw.cpp \ ! LFPulse.cpp Impulse.cpp Integrator.cpp Decay.cpp Decay2.cpp Lag.cpp \ No newline at end of file --- 10,13 ---- excess.cpp hypot.cpp ring1.cpp ring2.cpp ring3.cpp ring4.cpp \ 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 \ No newline at end of file

1 0

externals/sc4pd/source Lag.cpp,NONE,1.1 Decay2.cpp,1.1,1.2 main.cpp,1.14,1.15 sc4pd.hpp,1.1,1.2
by Tim Blechmann 02 Aug '04

02 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4950/source Modified Files: Decay2.cpp main.cpp sc4pd.hpp Added Files: Lag.cpp Log Message: lag Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.cpp 2 Aug 2004 20:13:59 -0000 1.14 --- main.cpp 2 Aug 2004 21:13:50 -0000 1.15 *************** *** 59,63 **** "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" ! " Integrator(~), Decay~, Decay2~\n" ); --- 59,63 ---- "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" ! " Integrator(~), Decay~, Decay2~, Lag~\n" ); *************** *** 197,200 **** --- 197,202 ---- FLEXT_DSP_SETUP(Decay2_ar); + + FLEXT_DSP_SETUP(Lag_ar); } Index: sc4pd.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/sc4pd.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sc4pd.hpp 2 Aug 2004 20:13:59 -0000 1.1 --- sc4pd.hpp 2 Aug 2004 21:13:50 -0000 1.2 *************** *** 49,55 **** //#define CALCSLOPE(next,prev) ((next - prev) * unit->mRate->mSlopeFactor) #undef CALCSLOPE ! #define CALCSLOPE(next,prev) ((next - prev) * 1/Blocksize()) ! ! --- 49,53 ---- //#define CALCSLOPE(next,prev) ((next - prev) * unit->mRate->mSlopeFactor) #undef CALCSLOPE ! #define CALCSLOPE(next,prev) ((next - prev) * 1/ Blocksize()) --- NEW FILE: Lag.cpp --- /* sc4pd Lag~, Lag 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: Live from the Vision Festival */ #include "sc4pd.hpp" /* ------------------------ Lag~ -----------------------------*/ class Lag_ar :public flext_dsp { FLEXT_HEADER(Lag_ar,flext_dsp); public: Lag_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); void m_set(float f); private: FLEXT_CALLBACK_F(m_set); float m_b1, n_b1; float m_y1; float m_lag; bool changed; }; FLEXT_LIB_DSP_V("Lag~",Lag_ar); Lag_ar::Lag_ar(int argc,t_atom * argv) { FLEXT_ADDMETHOD_(0,"lagTime",m_set); AtomList Args(argc,argv); m_lag = sc_getfloatarg(Args,0); AddOutSignal(); m_y1 = 0.f; } void Lag_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { changed = false; m_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate())); } void Lag_ar::m_signal(int n, t_sample *const *in, t_sample *const *out) { t_sample *nout = *out; t_sample *nin = *in; float y1 = m_y1; float b1 = m_b1; if (changed) { float b1_slope = CALCSLOPE(m_b1, n_b1); m_b1 = n_b1; for (int i = 0; i!= n;++i) { float y0 = ZXP(nin); ZXP(nout) = y1 = y0 + b1 * (y1 - y0); b1 += b1_slope; } changed = false; } else { for (int i = 0; i!= n;++i) { float y0 = ZXP(nin); ZXP(nout) = y1 = y0 + b1 * (y1 - y0); } } m_y1 = zapgremlins(y1); } void Lag_ar::m_set(float f) { m_lag = f; n_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate())); changed = true; } /* todo: does a control rate Lag make sense? */ Index: Decay2.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/sc4pd/source/Decay2.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Decay2.cpp 2 Aug 2004 20:13:59 -0000 1.1 --- Decay2.cpp 2 Aug 2004 21:13:50 -0000 1.2 *************** *** 147,150 **** --- 147,151 ---- m_b1b = m_attackTime == 0.f ? 0.f : exp(log001 / (m_attackTime * Samplerate())); + changed = false; }

1 0

externals/sc4pd/pd lag.pd,NONE,1.1
by Tim Blechmann 02 Aug '04

02 Aug '04

Update of /cvsroot/pure-data/externals/sc4pd/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4950/pd Added Files: lag.pd Log Message: lag --- NEW FILE: lag.pd --- #N canvas 0 0 450 300 10; #X obj 159 205 dac~; #X obj 239 198 print~; #X obj 244 171 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 257 82 hsl 128 15 1e-04 1 1 0 empty empty empty -2 -6 0 8 -262144 -1 -1 0 0; #X msg 254 102 lagTime \$1; #X obj 155 61 WhiteNoise~; #X obj 156 130 Lag~ 0.0004; #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 6 0; #X connect 5 0 6 0; #X connect 6 0 0 0; #X connect 6 0 0 1; #X connect 6 0 1 0;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2004