From 732d85194f69cc1d6b72d67e48211799cd5583e3 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sun, 1 Aug 2004 19:00:30 +0000 Subject: checkin: lfpulse, lfsaw svn path=/trunk/externals/tb/; revision=1901 --- sc4pd/make-files.txt | 3 +- sc4pd/pd/lfpulse.pd | 42 +++++++ sc4pd/pd/lfsaw.pd | 29 +++++ sc4pd/source/LFPulse.cpp | 299 +++++++++++++++++++++++++++++++++++++++++++++++ sc4pd/source/LFSaw.cpp | 263 +++++++++++++++++++++++++++++++++++++++++ sc4pd/source/main.cpp | 13 ++- sc4pd/source/support.hpp | 29 +++++ 7 files changed, 673 insertions(+), 5 deletions(-) create mode 100644 sc4pd/pd/lfpulse.pd create mode 100644 sc4pd/pd/lfsaw.pd create mode 100644 sc4pd/source/LFPulse.cpp create mode 100644 sc4pd/source/LFSaw.cpp diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt index c5a874b..8c45378 100755 --- a/sc4pd/make-files.txt +++ b/sc4pd/make-files.txt @@ -8,4 +8,5 @@ SRCS= \ ExpRand.cpp LFClipNoise.cpp LFNoise0.cpp LFNoise1.cpp LFNoise2.cpp \ 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 \ No newline at end of file + difsqr.cpp sumsqr.cpp sqrdif.cpp sqrsum.cpp absdif.cpp LFSaw.cpp \ + LFPulse.cpp \ No newline at end of file diff --git a/sc4pd/pd/lfpulse.pd b/sc4pd/pd/lfpulse.pd new file mode 100644 index 0000000..f8cdec5 --- /dev/null +++ b/sc4pd/pd/lfpulse.pd @@ -0,0 +1,42 @@ +#N canvas 0 0 782 300 10; +#X obj 93 170 dac~; +#X obj 108 75 sig~ 440; +#X floatatom 227 53 5 0 0 0 - - -; +#X msg 20 31 kr; +#X msg 62 30 ar; +#X floatatom 363 150 5 0 0 0 - - -; +#X obj 343 235 timer; +#X floatatom 343 267 5 0 0 0 - - -; +#X obj 353 197 t b b; +#X msg 402 29 0.1; +#X msg 451 39 kr 10; +#X msg 223 88 freq \$1; +#X obj 107 117 LFPulse~ 440 0.3 ar; +#X msg 162 48 width \$1; +#X floatatom 162 20 5 0 0 0 - - -; +#X obj 373 128 change; +#X obj 376 89 LFPulse 1 0.5 20; +#X msg 162 48 width \$1; +#X floatatom 162 20 5 0 0 0 - - -; +#X msg 598 46 width \$1; +#X floatatom 598 18 5 0 0 0 - - -; +#X connect 1 0 12 0; +#X connect 2 0 11 0; +#X connect 3 0 12 0; +#X connect 4 0 12 0; +#X connect 5 0 8 0; +#X connect 6 0 7 0; +#X connect 8 0 6 0; +#X connect 8 1 6 1; +#X connect 9 0 16 0; +#X connect 10 0 16 0; +#X connect 11 0 12 0; +#X connect 12 0 0 0; +#X connect 12 0 0 1; +#X connect 13 0 12 0; +#X connect 14 0 13 0; +#X connect 15 0 5 0; +#X connect 16 0 15 0; +#X connect 18 0 17 0; +#X connect 19 0 16 0; +#X connect 20 0 19 0; diff --git a/sc4pd/pd/lfsaw.pd b/sc4pd/pd/lfsaw.pd new file mode 100644 index 0000000..ed3f7b3 --- /dev/null +++ b/sc4pd/pd/lfsaw.pd @@ -0,0 +1,29 @@ +#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 floatatom 227 53 5 0 0 0 - - -; +#X msg 20 31 kr; +#X msg 62 30 ar; +#X floatatom 349 176 5 0 0 0 - - -; +#X obj 343 235 timer; +#X floatatom 343 267 5 0 0 0 - - -; +#X obj 353 197 t b b; +#X obj 376 89 LFSaw 2 50; +#X msg 402 29 0.1; +#X msg 451 39 kr 10; +#X msg 223 88 freq \$1; +#X connect 1 0 0 0; +#X connect 1 0 0 1; +#X connect 2 0 1 0; +#X connect 3 0 13 0; +#X connect 4 0 1 0; +#X connect 5 0 1 0; +#X connect 6 0 9 0; +#X connect 7 0 8 0; +#X connect 9 0 7 0; +#X connect 9 1 7 1; +#X connect 10 0 6 0; +#X connect 11 0 10 0; +#X connect 12 0 10 0; +#X connect 13 0 1 0; diff --git a/sc4pd/source/LFPulse.cpp b/sc4pd/source/LFPulse.cpp new file mode 100644 index 0000000..76abc2c --- /dev/null +++ b/sc4pd/source/LFPulse.cpp @@ -0,0 +1,299 @@ +/* sc4pd + LFPulse, LFPulse~ + + 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 & Oren Ambarchi: Flypaper + +*/ + +#include +#include "SC_PlugIn.h" +#include "support.hpp" + + +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) +#error You need at least FLEXT version 0.4.6 +#endif + + +/* ------------------------ LFPulse~ -------------------------------*/ + +class LFPulse_ar: + public flext_dsp +{ + FLEXT_HEADER(LFPulse_ar,flext_dsp); + +public: + LFPulse_ar(int argc, t_atom *argv); + +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); + + void m_set(float f) + { + m_freq=f; + } + + void m_ar() + { + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_ar)); + } + + void m_kr() + { + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_kr)); + } + + void m_width (float f) + { + nextDuty = f; + } + + +private: + double mPhase; + float mFreqMul; + float m_freq; //for kr arguments + float mDuty; + float nextDuty; + + DEFSIGCALL (m_signal_fun); + DEFSIGFUN (m_signal_ar); + DEFSIGFUN (m_signal_kr); + + FLEXT_CALLBACK_F(m_set); + FLEXT_CALLBACK_F(m_width); + FLEXT_CALLBACK(m_ar); + FLEXT_CALLBACK(m_kr); +}; + +FLEXT_LIB_DSP_V("LFPulse~",LFPulse_ar); + +LFPulse_ar::LFPulse_ar(int argc, t_atom *argv) +{ + FLEXT_ADDMETHOD_(0,"freq",m_set); + FLEXT_ADDMETHOD_(0,"width",m_width); + FLEXT_ADDMETHOD_(0,"ar",m_ar); + FLEXT_ADDMETHOD_(0,"kr",m_kr); + + //parse arguments + AtomList Args(argc,argv); + + m_freq = sc_getfloatarg(Args,0); + + nextDuty = sc_getfloatarg(Args,1); + + if(sc_ar(Args)) + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_ar)); + else // if not given, use control rate + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_kr)); + + AddOutSignal(); +} + +void LFPulse_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) +{ + mFreqMul = 1 / Samplerate(); + +} + +void LFPulse_ar::m_signal_ar(int n, t_sample *const *in, + t_sample *const *out) +{ + t_sample *freq = *in; + t_sample *xout = *out; + + float freqmul = mFreqMul; + double phase = mPhase; + float duty = mDuty; + + for (int i = 0; i!= n;++i) + { + float z; + if (phase >= 1.f) + { + phase -= 1.f; + duty = mDuty = nextDuty; + // output at least one sample from the opposite polarity + z = duty < 0.5 ? 1.f : 0.f; + } + else + { + z = phase < duty ? 1.f : 0.f; + } + + phase += (*(freq)++) * freqmul; + (*(xout)++) = z; + } + + mPhase=phase; +} + + +void LFPulse_ar::m_signal_kr(int n, t_sample *const *in, + t_sample *const *out) +{ + t_sample *xout = *out; + + double phase = mPhase; + float duty = mDuty; + float freq = m_freq * mFreqMul; + + for (int i = 0; i!= n;++i) + { + float z; + if (phase >= 1.f) + { + phase -= 1.f; + duty = mDuty = nextDuty; + // output at least one sample from the opposite polarity + z = duty < 0.5 ? 1.f : 0.f; + } + else + { + z = phase < duty ? 1.f : 0.f; + } + + phase += freq; + (*(xout)++) = z; + } + mPhase=phase; +} + +/* ------------------------ LFPulse ---------------------------------*/ + +/* todo: remove obsolete messages */ + +class LFPulse_kr: + public flext_base +{ + FLEXT_HEADER(LFPulse_kr,flext_base); + +public: + LFPulse_kr(int argc, t_atom *argv); + +protected: + void m_perform(void*); + + void m_set(float f) + { + m_freq_set = f; + m_freq = f * mFreqMul; + } + + void m_set_kr(float f) + { + if (f != 0) + { + dt = f * 0.001; + mFreqMul = dt; + m_freq = m_freq_set * mFreqMul; + m_timer.Reset(); + m_timer.Periodic(dt); + } + } + + void m_set_width(float f) + { + nextDuty=f; + } + +private: + double mPhase; + float mFreqMul; + float mDuty; + float nextDuty; + float m_freq; + float dt; + float m_freq_set; + + Timer m_timer; + + FLEXT_CALLBACK_F(m_set_kr); + FLEXT_CALLBACK_F(m_set); + FLEXT_CALLBACK_F(m_set_width); + FLEXT_CALLBACK_T(m_perform); +}; + + +FLEXT_LIB_V("LFPulse",LFPulse_kr); + +LFPulse_kr::LFPulse_kr(int argc, t_atom *argv) +{ + FLEXT_ADDMETHOD(0,m_set); + FLEXT_ADDMETHOD_(0,"kr",m_set_kr); + FLEXT_ADDMETHOD_(0,"width",m_set_width); + + FLEXT_ADDTIMER(m_timer,m_perform); + + AddOutFloat(); + + //parse arguments + AtomList Args(argc,argv); + + m_freq_set = sc_getfloatarg(Args,0); + + nextDuty = sc_getfloatarg(Args,1); + + dt = sc_getfloatarg(Args,2) * 0.001; + + if (dt == 0) + dt = 0.02; // 20 ms as default control rate as in line + mFreqMul = dt; + + m_freq = m_freq_set * mFreqMul; + + m_timer.Periodic(dt); + +} + +void LFPulse_kr::m_perform(void*) +{ + float z; + if (mPhase >= 1.f) + { + mPhase -= 1.f; + mDuty = nextDuty; + // output at least one sample from the opposite polarity + z = mDuty < 0.5 ? 1.f : 0.f; + } + else + { + z = mPhase < mDuty ? 1.f : 0.f; + } + mPhase += m_freq; + ToOutFloat(0,z); +} diff --git a/sc4pd/source/LFSaw.cpp b/sc4pd/source/LFSaw.cpp new file mode 100644 index 0000000..358cb2f --- /dev/null +++ b/sc4pd/source/LFSaw.cpp @@ -0,0 +1,263 @@ +/* sc4pd + LFSaw, LFSaw~ + + 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 & Oren Ambarchi: Flypaper + +*/ + +#include +#include "SC_PlugIn.h" +#include "support.hpp" + + +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406) +#error You need at least FLEXT version 0.4.6 +#endif + + +/* ------------------------ LFSaw~ -------------------------------*/ + +class LFSaw_ar: + public flext_dsp +{ + FLEXT_HEADER(LFSaw_ar,flext_dsp); + +public: + LFSaw_ar(int argc, t_atom *argv); + +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); + + void m_set(float f) + { + m_freq=f; + } + + void m_ar() + { + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_ar)); + } + + void m_kr() + { + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_kr)); + } + +private: + double mPhase; + float mFreqMul; + float m_freq; //for kr arguments + + DEFSIGCALL (m_signal_fun); + DEFSIGFUN (m_signal_ar); + DEFSIGFUN (m_signal_kr); + + FLEXT_CALLBACK_F(m_set); + FLEXT_CALLBACK(m_ar); + FLEXT_CALLBACK(m_kr); +}; + +FLEXT_LIB_DSP_V("LFSaw~",LFSaw_ar); + +LFSaw_ar::LFSaw_ar(int argc, t_atom *argv) +{ + FLEXT_ADDMETHOD_(0,"freq",m_set); + FLEXT_ADDMETHOD_(0,"ar",m_ar); + FLEXT_ADDMETHOD_(0,"kr",m_kr); + + //parse arguments + AtomList Args(argc,argv); + + m_freq = sc_getfloatarg(Args,0); + + if(sc_ar(Args)) + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_ar)); + else // if not given, use control rate + SETSIGFUN(m_signal_fun,SIGFUN(m_signal_kr)); + + AddOutSignal(); +} + +void LFSaw_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out) +{ + mFreqMul = 2 / Samplerate(); +} + +void LFSaw_ar::m_signal_ar(int n, t_sample *const *in, + t_sample *const *out) +{ + t_sample *freq = *in; + t_sample *xout = *out; + + float freqmul = mFreqMul; + double phase = mPhase; + + for (int i = 0; i!= n;++i) + { + float z = phase; // out must be written last for in place operation + phase += (*(freq)++) * freqmul; + if (phase >= 1.f) + phase -= 2.f; + else + if (phase <= -1.f) + phase += 2.f; + (*(xout)++) = z; + } + + mPhase=phase; +} + + +void LFSaw_ar::m_signal_kr(int n, t_sample *const *in, + t_sample *const *out) +{ + t_sample *xout = *out; + + float freq = m_freq * mFreqMul; + double phase = mPhase; + + if (freq >= 0.f) + { + for (int i = 0; i!= n;++i) + { + (*(xout)++) = phase; + phase += freq; + if (phase >= 1.f) phase -= 2.f; + } + } + else + { + for (int i = 0; i!= n;++i) + { + (*(xout)++) = phase; + phase += freq; + if (phase <= -1.f) phase += 2.f; + } + } + + mPhase=phase; +} + +/* ------------------------ LFSaw ---------------------------------*/ + +class LFSaw_kr: + public flext_base +{ + FLEXT_HEADER(LFSaw_kr,flext_base); + +public: + LFSaw_kr(int argc, t_atom *argv); + +protected: + void m_perform(void*); + + void m_set(float f) + { + m_freq_set = f; + m_freq = f * mFreqMul; + } + + void m_set_kr(float f) + { + if (f != 0) + { + dt = f * 0.001; + mFreqMul = 2*dt; + m_freq = m_freq_set * mFreqMul; + m_timer.Reset(); + m_timer.Periodic(dt); + } + } + +private: + double mPhase; + float mFreqMul; + float m_freq; + float dt; + float m_freq_set; + + Timer m_timer; + + FLEXT_CALLBACK_F(m_set_kr); + FLEXT_CALLBACK_F(m_set); + FLEXT_CALLBACK_T(m_perform); +}; + + +FLEXT_LIB_V("LFSaw",LFSaw_kr); + +LFSaw_kr::LFSaw_kr(int argc, t_atom *argv) +{ + FLEXT_ADDMETHOD(0,m_set); + FLEXT_ADDMETHOD_(0,"kr",m_set_kr); + // FLEXT_ADDBANG(0,m_perform); + FLEXT_ADDTIMER(m_timer,m_perform); + + AddOutFloat(); + + //parse arguments + AtomList Args(argc,argv); + + m_freq_set = sc_getfloatarg(Args,0); + + dt = sc_getfloatarg(Args,1) * 0.001; + + if (dt == 0 ) + dt = 0.02; // 20 ms as default control rate as in line + mFreqMul = 2 * dt; /* test this !!! */ + + m_freq = m_freq_set * mFreqMul; + + m_timer.Periodic(dt); + +} + +void LFSaw_kr::m_perform(void*) +{ + if (m_freq >= 0.f) + { + ToOutFloat(0,mPhase); + mPhase += m_freq; + if (mPhase >= 1.f) mPhase -= 2.f; + } + else + { + ToOutFloat(0,mPhase); + mPhase += m_freq; + if (mPhase <= -1.f) mPhase += 2.f; + } +} diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp index df430f9..7b16ccb 100644 --- a/sc4pd/source/main.cpp +++ b/sc4pd/source/main.cpp @@ -32,7 +32,6 @@ http://www.audiosynth.com Coded while listening to: Phosphor - */ #include @@ -61,9 +60,9 @@ void sc4pd_library_setup() "Latoocarfian(~),\n" " LinCong(~), amclip(~), scaleneg(~), excess(~), hypot(~), " "ring1(~),\n" - " ring2(~), ring3(~), ring4(~), difsqr(~), sumsqr(~)\n" - "sqrdif(~), sqrsum(~),\n" - " absdif(~)"); + " ring2(~), ring3(~), ring4(~), difsqr(~), sumsqr(~), " + "sqrdif(~),\n" + " sqrsum(~), absdif(~), LFSaw(~), LFPulse(~)"); //initialize objects FLEXT_DSP_SETUP(Dust_ar); @@ -184,6 +183,12 @@ void sc4pd_library_setup() FLEXT_DSP_SETUP(absdif_ar); FLEXT_SETUP(absdif_kr); + + FLEXT_DSP_SETUP(LFSaw_ar); + FLEXT_SETUP(LFSaw_kr); + + FLEXT_DSP_SETUP(LFPulse_ar); + FLEXT_SETUP(LFPulse_kr); } FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup); diff --git a/sc4pd/source/support.hpp b/sc4pd/source/support.hpp index 79faff5..d05497e 100644 --- a/sc4pd/source/support.hpp +++ b/sc4pd/source/support.hpp @@ -64,3 +64,32 @@ bool sc_ar(flext::AtomList a); rgen.s3 = s3; int32 timeseed(); + + +/* this is copied from thomas grill's xsample: +xsample - extended sample objects for Max/MSP and pd (pure data) + +Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net) +For information on usage and redistribution, and for a DISCLAIMER OF ALL +WARRANTIES, see the file, "license.txt," in this distribution. +*/ + +#define F float +#define D double +#define I int +#define L long +#define C char +#define V void +#define BL bool +#define S t_sample + +#define SETSIGFUN(VAR,FUN) v_##VAR = FUN + +#define DEFSIGFUN(NAME) V NAME(I n,S *const *in,S *const *out) + +#define DEFSIGCALL(NAME) \ + inline V NAME(I n,S *const *in,S *const *out) \ + { (this->*v_##NAME)(n,in,out); } \ + V (thisType::*v_##NAME)(I n,S *const *invecs,S *const *outvecs) + +#define SIGFUN(FUN) &thisType::FUN -- cgit v1.2.1