diff options
| -rwxr-xr-x | sc4pd/make-files.txt | 2 | ||||
| -rw-r--r-- | sc4pd/pd/LFSaw.pd | 16 | ||||
| -rw-r--r-- | sc4pd/pd/decay.pd | 12 | ||||
| -rw-r--r-- | sc4pd/pd/decay2.pd | 12 | ||||
| -rw-r--r-- | sc4pd/readme.txt | 5 | ||||
| -rw-r--r-- | sc4pd/source/Decay.cpp | 7 | ||||
| -rw-r--r-- | sc4pd/source/Decay2.cpp | 153 | ||||
| -rw-r--r-- | sc4pd/source/main.cpp | 4 | ||||
| -rw-r--r-- | sc4pd/source/ring1.cpp | 8 | ||||
| -rw-r--r-- | sc4pd/source/sc4pd.hpp | 60 |
10 files changed, 266 insertions, 13 deletions
diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt index 49ba19b..5a2aaf7 100755 --- a/sc4pd/make-files.txt +++ b/sc4pd/make-files.txt @@ -9,4 +9,4 @@ SRCS= \ Logistic.cpp Latoocarfian.cpp LinCong.cpp amclip.cpp scaleneg.cpp \ 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
\ No newline at end of file + LFPulse.cpp Impulse.cpp Integrator.cpp Decay.cpp Decay2.cpp
\ No newline at end of file diff --git a/sc4pd/pd/LFSaw.pd b/sc4pd/pd/LFSaw.pd new file mode 100644 index 0000000..190ddcf --- /dev/null +++ b/sc4pd/pd/LFSaw.pd @@ -0,0 +1,16 @@ +#N canvas 0 0 782 300 10; +#X obj 93 170 dac~; +#X obj 107 117 LFSaw~ 440 ar; +#X obj 108 75 sig~ 440; +#X msg 223 88 set \$1; +#X floatatom 227 53 5 0 0 0 - - -; +#X msg 20 31 kr; +#X msg 62 30 ar; +#X obj 405 107 LFSaw 1 100; +#X connect 1 0 0 0; +#X connect 1 0 0 1; +#X connect 2 0 1 0; +#X connect 3 0 1 0; +#X connect 4 0 3 0; +#X connect 5 0 1 0; +#X connect 6 0 1 0; diff --git a/sc4pd/pd/decay.pd b/sc4pd/pd/decay.pd new file mode 100644 index 0000000..4d54e30 --- /dev/null +++ b/sc4pd/pd/decay.pd @@ -0,0 +1,12 @@ +#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 149 72 Dust~ 440; +#X obj 156 130 Decay~ 0.01; +#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; diff --git a/sc4pd/pd/decay2.pd b/sc4pd/pd/decay2.pd new file mode 100644 index 0000000..98260f6 --- /dev/null +++ b/sc4pd/pd/decay2.pd @@ -0,0 +1,12 @@ +#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 149 72 Dust~ 440; +#X obj 156 130 Decay2~ 0.01 0.002; +#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; diff --git a/sc4pd/readme.txt b/sc4pd/readme.txt index 7372555..9a09b43 100644 --- a/sc4pd/readme.txt +++ b/sc4pd/readme.txt @@ -19,5 +19,8 @@ thanks to: Miller Puckette for PureData Thomas Grill for Flext three great pieces of software... - + + thanks for bug reports: + Gerard (0001@ooo000ooo.org) + bugs, suggestions, complains to: TimBlechmann@gmx.de
\ No newline at end of file diff --git a/sc4pd/source/Decay.cpp b/sc4pd/source/Decay.cpp index 38112aa..467611c 100644 --- a/sc4pd/source/Decay.cpp +++ b/sc4pd/source/Decay.cpp @@ -37,6 +37,7 @@ #include "sc4pd.hpp" +/* todo: linear interpolation is broken */ /* ------------------------ Decay~ -----------------------------*/ class Decay_ar @@ -67,7 +68,7 @@ Decay_ar::Decay_ar(int argc,t_atom * argv) AtomList Args(argc,argv); - m_b1 = sc_getfloatarg(Args,0); + decayTime = sc_getfloatarg(Args,0); AddOutSignal(); @@ -148,12 +149,12 @@ void Decay_ar::m_signal(int n, t_sample *const *in, void Decay_ar::m_set(float f) { decayTime = f; - m_b1= 0.f ? 0.f : exp(log001 / (decayTime * Samplerate())); + m_b1= f == 0.f ? 0.f : exp(log001 / (decayTime * Samplerate())); } void Decay_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) { - m_b1= 0.f ? 0.f : exp(log001 / (decayTime * Samplerate())); + m_b1= decayTime == 0.f ? 0.f : exp(log001 / (decayTime * Samplerate())); } /* todo: does it make sense to implement a message-based Decay? diff --git a/sc4pd/source/Decay2.cpp b/sc4pd/source/Decay2.cpp new file mode 100644 index 0000000..557f057 --- /dev/null +++ b/sc4pd/source/Decay2.cpp @@ -0,0 +1,153 @@ +/* sc4pd + Decay2~, Decay2 + + 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: AMM: AMMMusic 1966 + +*/ + +#include "sc4pd.hpp" + + +/* ------------------------ Decay2~ -----------------------------*/ + +class Decay2_ar + :public flext_dsp +{ + FLEXT_HEADER(Decay2_ar,flext_dsp); + +public: + Decay2_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_attack(float f); + void m_decay(float f); + +private: + FLEXT_CALLBACK_F(m_decay); + FLEXT_CALLBACK_F(m_attack); + float m_attackTime, m_y1a, m_b1a, n_b1a; + float m_decayTime, m_y1b, m_b1b, n_b1b; + bool changed; +}; + +FLEXT_LIB_DSP_V("Decay2~",Decay2_ar); + +Decay2_ar::Decay2_ar(int argc,t_atom * argv) +{ + FLEXT_ADDMETHOD_(0,"decayTime",m_decay); + FLEXT_ADDMETHOD_(0,"attackTime",m_attack); + + AtomList Args(argc,argv); + + m_decayTime = sc_getfloatarg(Args,1); //decay + m_attackTime = sc_getfloatarg(Args,0);//attack + + AddOutSignal(); + + m_y1a = m_y1b = 0.f; //different than in sc + +} + +void Decay2_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 b1a = m_b1a; + float b1b = m_b1b; + + if(changed) + { + float b1a_slope = CALCSLOPE(n_b1a, b1a); + float b1b_slope = CALCSLOPE(n_b1b, b1b); + m_b1a = n_b1a; + m_b1b = n_b1b; + + for (int i = 0; i!= n;++i) + { + float y0 = ZXP(nin); + y1a = y0 + b1a * y1a; + y1b = y0 + b1b * y1b; + + ZXP (nout) = y1a - y1b; + b1a += b1a_slope; + b1b += b1b_slope; + } + changed = false; + } + else + { + for (int i = 0; i!= n;++i) + { + float y0 = ZXP(nin); + y1a = y0 + b1a * y1a; + y1b = y0 + b1b * y1b; + + ZXP (nout) = y1a - y1b; + } + } + + m_y1a = zapgremlins(y1a); + m_y1b = zapgremlins(y1b); +} + +void Decay2_ar::m_decay(float f) +{ + m_decayTime = f; + n_b1a = f == 0.f ? 0.f : exp(log001 / (f * Samplerate())); + changed = true; +} + +void Decay2_ar::m_attack(float f) +{ + m_attackTime = f; + n_b1b = f == 0.f ? 0.f : exp(log001 / (f * Samplerate())); + changed = true; +} + +void Decay2_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) +{ + m_b1a = m_decayTime == 0.f ? 0.f : exp(log001 / + (m_decayTime * Samplerate())); + m_b1b = m_attackTime == 0.f ? 0.f : exp(log001 / + (m_attackTime * Samplerate())); +} + +/* todo: does it make sense to implement a message-based Decay2? + Probably not... */ + diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp index cbec3c3..1f76f4c 100644 --- a/sc4pd/source/main.cpp +++ b/sc4pd/source/main.cpp @@ -58,7 +58,7 @@ void sc4pd_library_setup() " ring2(~), ring3(~), ring4(~), difsqr(~), sumsqr(~), " "sqrdif(~),\n" " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n" - " Integrator(~), Decay~\n" + " Integrator(~), Decay~, Decay2~\n" ); //initialize objects @@ -194,6 +194,8 @@ void sc4pd_library_setup() FLEXT_SETUP(Integrator_kr); FLEXT_DSP_SETUP(Decay_ar); + + FLEXT_DSP_SETUP(Decay2_ar); } FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup); diff --git a/sc4pd/source/ring1.cpp b/sc4pd/source/ring1.cpp index b9aee15..f3bce43 100644 --- a/sc4pd/source/ring1.cpp +++ b/sc4pd/source/ring1.cpp @@ -35,13 +35,7 @@ */ -#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 - +#include "sc4pd.hpp" inline float sc_ring1 (float a, float b) { diff --git a/sc4pd/source/sc4pd.hpp b/sc4pd/source/sc4pd.hpp new file mode 100644 index 0000000..214b80c --- /dev/null +++ b/sc4pd/source/sc4pd.hpp @@ -0,0 +1,60 @@ +/* sc4pd: + support functions + + 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: Morton Feldman: For John Cage + +*/ + +#include <flext.h> + +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) +#error You need at least FLEXT version 0.4.6 +#endif + +#include "SC_PlugIn.h" +#include "support.hpp" + +/* this macro has to be redefined to work with flext */ + +// calculate a slope for control rate interpolation to audio rate. +//#define CALCSLOPE(next,prev) ((next - prev) * unit->mRate->mSlopeFactor) +#undef CALCSLOPE +#define CALCSLOPE(next,prev) ((next - prev) * 1/Blocksize()) + + + + +/* to make sure the behaviour is consistent: */ + +#undef ZXP +#define ZXP(z) (*(z)++) + |