aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xsc4pd/config-pd-linux.txt4
-rwxr-xr-xsc4pd/make-files.txt2
-rw-r--r--sc4pd/makefile.pd-linux2
-rw-r--r--sc4pd/pd/lfnoise0.pd13
-rw-r--r--sc4pd/pd/lfnoise1.pd17
-rw-r--r--sc4pd/source/LFClipNoise.cpp12
-rw-r--r--sc4pd/source/LFNoise0.cpp14
-rw-r--r--sc4pd/source/LFNoise1.cpp239
-rw-r--r--sc4pd/source/LFNoise2.cpp278
-rw-r--r--sc4pd/source/main.cpp8
10 files changed, 568 insertions, 21 deletions
diff --git a/sc4pd/config-pd-linux.txt b/sc4pd/config-pd-linux.txt
index e3d8dc1..7aac9a8 100755
--- a/sc4pd/config-pd-linux.txt
+++ b/sc4pd/config-pd-linux.txt
@@ -28,8 +28,8 @@ HELPDIR=${PD}/doc/5.reference
# additional compiler flags
# (check whether they fit to your system!)
-#UFLAGS=-xN -tpp7 -ip -ipo_obj # icc
-# UFLAGS=-mcpu=pentium4 -mmmx -msse2 -msse -mfpmath=sse # gcc 3.2
+UFLAGS=-xN -tpp7 -ip -ipo_obj # icc
+#UFLAGS=-g -mcpu=pentium4 -mmmx -msse2 -msse -mfpmath=sse # gcc 3.2
# define to link against shared flext library (flext version >= 0.5.0)
diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt
index 4f7f78a..5952f9a 100755
--- a/sc4pd/make-files.txt
+++ b/sc4pd/make-files.txt
@@ -5,4 +5,4 @@ SRCS= \
BrownNoise.cpp ClipNoise.cpp GrayNoise.cpp WhiteNoise.cpp \
PinkNoise.cpp Dust2.cpp Crackle.cpp Rand.cpp TRand.cpp TExpRand.cpp \
IRand.cpp TIRand.cpp CoinGate.cpp support.cpp LinRand.cpp NRand.cpp\
- ExpRand.cpp LFClipNoise.cpp LFNoise0.cpp \ No newline at end of file
+ ExpRand.cpp LFClipNoise.cpp LFNoise0.cpp LFNoise1.cpp LFNoise2.cpp \ No newline at end of file
diff --git a/sc4pd/makefile.pd-linux b/sc4pd/makefile.pd-linux
index 994141c..fc55ec6 100644
--- a/sc4pd/makefile.pd-linux
+++ b/sc4pd/makefile.pd-linux
@@ -55,7 +55,7 @@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
$(CXX) $(LDFLAGS) -shared $^ $(patsubst %,-l%,$(LIBS)) -L$(FLEXTPATH) $(LINKFLEXT) -o $@
- #strip --strip-unneeded $@
+ strip --strip-unneeded $@
chmod 755 $@
$(INSTDIR):
diff --git a/sc4pd/pd/lfnoise0.pd b/sc4pd/pd/lfnoise0.pd
index 882d0dd..afcc0a3 100644
--- a/sc4pd/pd/lfnoise0.pd
+++ b/sc4pd/pd/lfnoise0.pd
@@ -3,8 +3,15 @@
#X obj 141 88 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
-1;
#X floatatom 246 97 5 0 0 0 - - -;
-#X obj 246 55 LFNoise0 10;
#X obj 89 48 LFNoise0~ 1000;
+#X obj 246 143 timer;
+#X obj 246 123 t b b;
+#X floatatom 246 168 5 0 0 0 - - -;
+#X obj 246 55 LFNoise0 10;
#X connect 1 0 0 0;
-#X connect 3 0 2 0;
-#X connect 4 0 0 0;
+#X connect 2 0 5 0;
+#X connect 3 0 0 0;
+#X connect 4 0 6 0;
+#X connect 5 0 4 0;
+#X connect 5 1 4 1;
+#X connect 7 0 2 0;
diff --git a/sc4pd/pd/lfnoise1.pd b/sc4pd/pd/lfnoise1.pd
new file mode 100644
index 0000000..e6a261c
--- /dev/null
+++ b/sc4pd/pd/lfnoise1.pd
@@ -0,0 +1,17 @@
+#N canvas 0 0 450 300 10;
+#X obj 89 115 print~;
+#X obj 141 88 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X floatatom 246 97 5 0 0 0 - - -;
+#X obj 246 143 timer;
+#X obj 246 123 t b b;
+#X floatatom 246 168 5 0 0 0 - - -;
+#X obj 246 55 LFNoise0 10;
+#X obj 89 48 LFNoise1~ 100;
+#X connect 1 0 0 0;
+#X connect 2 0 4 0;
+#X connect 3 0 5 0;
+#X connect 4 0 3 0;
+#X connect 4 1 3 1;
+#X connect 6 0 2 0;
+#X connect 7 0 0 0;
diff --git a/sc4pd/source/LFClipNoise.cpp b/sc4pd/source/LFClipNoise.cpp
index 9aa6dfc..18f95ee 100644
--- a/sc4pd/source/LFClipNoise.cpp
+++ b/sc4pd/source/LFClipNoise.cpp
@@ -154,7 +154,7 @@ public:
LFClipNoise_kr(int argc, t_atom *argv);
protected:
- void m_perform();
+ void m_perform(void*);
void m_seed(int i)
{
@@ -163,9 +163,9 @@ protected:
void m_set(float f)
{
- double dt = sc_min(1/f, .001f);
+ double dt = sc_max(1/f, .001f);
m_timer.Reset();
- m_timer.Periodic(1000*dt);
+ m_timer.Periodic(dt);
}
private:
@@ -187,16 +187,16 @@ LFClipNoise_kr::LFClipNoise_kr(int argc, t_atom *argv)
//parse arguments
AtomList Args(argc,argv);
- double dt = sc_min(1/sc_getfloatarg(Args,0), .001f);
+ double dt = sc_max(1/sc_getfloatarg(Args,0), .001f);
rgen.init(timeseed());
- m_timer.Periodic(1000*dt);
+ m_timer.Periodic(dt);
AddOutFloat();
}
-void LFClipNoise_kr::m_perform()
+void LFClipNoise_kr::m_perform(void*)
{
ToOutFloat(0,rgen.fcoin());
}
diff --git a/sc4pd/source/LFNoise0.cpp b/sc4pd/source/LFNoise0.cpp
index 6e9c5bb..c0f8abd 100644
--- a/sc4pd/source/LFNoise0.cpp
+++ b/sc4pd/source/LFNoise0.cpp
@@ -154,8 +154,8 @@ public:
LFNoise0_kr(int argc, t_atom *argv);
protected:
- void m_perform();
-
+ void m_perform(void*);
+
void m_seed(int i)
{
rgen.init(i);
@@ -163,9 +163,9 @@ protected:
void m_set(float f)
{
- double dt = sc_min(1/f, .001f);
+ double dt = sc_max(1/f, .001f);
m_timer.Reset();
- m_timer.Periodic(1000*dt);
+ m_timer.Periodic(dt);
}
private:
@@ -187,16 +187,16 @@ LFNoise0_kr::LFNoise0_kr(int argc, t_atom *argv)
//parse arguments
AtomList Args(argc,argv);
- double dt = sc_min(1/sc_getfloatarg(Args,0), .001f);
+ double dt = sc_max(1/sc_getfloatarg(Args,0), .001f);
rgen.init(timeseed());
- m_timer.Periodic(1000*dt);
+ m_timer.Periodic(dt);
AddOutFloat();
}
-void LFNoise0_kr::m_perform()
+void LFNoise0_kr::m_perform(void*)
{
ToOutFloat(0,rgen.frand2());
}
diff --git a/sc4pd/source/LFNoise1.cpp b/sc4pd/source/LFNoise1.cpp
new file mode 100644
index 0000000..e48d3bb
--- /dev/null
+++ b/sc4pd/source/LFNoise1.cpp
@@ -0,0 +1,239 @@
+/* sc4pd
+ LFNoise1, LFNoise1~
+
+ 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: Fred Frith: Gravity
+
+*/
+
+#include <flext.h>
+#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
+
+
+/* ------------------------ LFNoise1~ -------------------------------*/
+
+class LFNoise1_ar:
+ public flext_dsp
+{
+ FLEXT_HEADER(LFNoise1_ar,flext_dsp);
+
+public:
+ LFNoise1_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_seed(int i)
+ {
+ rgen.init(i);
+ }
+
+ void m_set(float f)
+ {
+ m_freq = f;
+ }
+
+private:
+ RGen rgen;
+ float m_freq;
+ float m_level;
+ float m_slope;
+ int m_counter;
+ int m_sr;
+ FLEXT_CALLBACK_I(m_seed);
+ FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("LFNoise1~",LFNoise1_ar);
+
+LFNoise1_ar::LFNoise1_ar(int argc, t_atom *argv)
+{
+ FLEXT_ADDMETHOD_(0,"seed",m_seed);
+ FLEXT_ADDMETHOD_(0,"set",m_set);
+
+ //parse arguments
+ AtomList Args(argc,argv);
+
+ m_freq = sc_getfloatarg(Args,0);
+
+ rgen.init(timeseed());
+
+ m_counter=0;
+ m_level=rgen.frand2();
+ m_slope=0;
+
+ AddOutSignal();
+}
+
+void LFNoise1_ar::m_dsp(int n, t_sample *const *in,
+ t_sample *const *out)
+{
+ m_sr = Samplerate();
+}
+
+
+void LFNoise1_ar::m_signal(int n, t_sample *const *in,
+ t_sample *const *out)
+{
+ t_sample *nout = *out;
+
+ float level = m_level;
+ int32 counter = m_counter;
+ float slope = m_slope;
+
+ RGET;
+
+ int remain = n;
+ do
+ {
+ if (counter<=0)
+ {
+ counter = (int)(m_sr / sc_max(m_freq, .001f));
+ counter = sc_max(1, counter);
+ float nextlevel = frand2(s1,s2,s3);
+ slope = (nextlevel - level) / counter;
+ }
+ int nsmps = sc_min(remain, counter);
+ remain -= nsmps;
+ counter -= nsmps;
+
+ for (int i = 0; i!= nsmps;++i)
+ {
+ (*(nout)++)=level;
+ level+=slope;
+ }
+ }
+ while(remain);
+
+ m_level = level;
+ m_counter = counter;
+ m_slope = slope;
+
+ RPUT;
+}
+
+
+/* ------------------------ LFNoise1 ---------------------------------*/
+
+class LFNoise1_kr:
+ public flext_base
+{
+ FLEXT_HEADER(LFNoise1_kr,flext_base);
+
+public:
+ LFNoise1_kr(int argc, t_atom *argv);
+
+protected:
+ void m_perform(void*);
+
+ void m_seed(int i)
+ {
+ rgen.init(i);
+ }
+
+ void m_set(float);
+
+private:
+ RGen rgen;
+ float m_level;
+ float m_slope;
+
+ float dt; //in s
+ float tick; //in s
+ int counter;
+
+ Timer m_timer;
+ FLEXT_CALLBACK_I(m_seed);
+ FLEXT_CALLBACK_T(m_perform);
+ FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_V("LFNoise1",LFNoise1_kr);
+
+LFNoise1_kr::LFNoise1_kr(int argc, t_atom *argv)
+ : tick(0.01)
+{
+ FLEXT_ADDMETHOD_(0,"seed",m_seed);
+ FLEXT_ADDMETHOD_(0,"set",m_set);
+ FLEXT_ADDTIMER(m_timer,m_perform);
+
+ //parse arguments
+ AtomList Args(argc,argv);
+
+ rgen.init(timeseed());
+
+ m_level=rgen.frand2();
+
+ AddOutFloat();
+
+ m_set(sc_getfloatarg(Args,0));
+}
+
+void LFNoise1_kr::m_set(float f)
+{
+ dt = sc_max(1/f, .001f);
+ counter = (dt/tick);
+
+ float nextlevel = rgen.frand2();
+ m_slope = (nextlevel - m_level) / counter;
+
+ m_timer.Reset();
+ m_timer.Delay(tick);
+}
+
+void LFNoise1_kr::m_perform(void*)
+{
+ m_level+=m_slope;
+ ToOutFloat(0,m_level);
+ if (--counter)
+ {
+ m_timer.Reset();
+ m_timer.Delay(tick);
+ }
+ else
+ {
+ counter = (dt/tick);
+ float nextlevel = rgen.frand2();
+ m_slope = (nextlevel - m_level) / counter;
+
+ m_timer.Reset();
+ m_timer.Delay(tick);
+
+ }
+}
diff --git a/sc4pd/source/LFNoise2.cpp b/sc4pd/source/LFNoise2.cpp
new file mode 100644
index 0000000..71aff7d
--- /dev/null
+++ b/sc4pd/source/LFNoise2.cpp
@@ -0,0 +1,278 @@
+/* sc4pd
+ LFNoise2, LFNoise2~
+
+ 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: Guenther Mueller & Toshimaru Nakamura: Tint
+
+*/
+
+#include <flext.h>
+#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
+
+
+/* ------------------------ LFNoise2~ -------------------------------*/
+
+class LFNoise2_ar:
+ public flext_dsp
+{
+ FLEXT_HEADER(LFNoise2_ar,flext_dsp);
+
+public:
+ LFNoise2_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_seed(int i)
+ {
+ rgen.init(i);
+ }
+
+ void m_set(float f)
+ {
+ m_freq = f;
+ }
+
+private:
+ RGen rgen;
+ float m_freq;
+ float m_level;
+ float m_slope;
+ float m_curve;
+ int m_counter;
+ int m_sr;
+ float m_nextvalue;
+ float m_nextmidpt;
+
+ FLEXT_CALLBACK_I(m_seed);
+ FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("LFNoise2~",LFNoise2_ar);
+
+LFNoise2_ar::LFNoise2_ar(int argc, t_atom *argv)
+{
+ FLEXT_ADDMETHOD_(0,"seed",m_seed);
+ FLEXT_ADDMETHOD_(0,"set",m_set);
+
+ //parse arguments
+ AtomList Args(argc,argv);
+
+ m_freq = sc_getfloatarg(Args,0);
+
+ rgen.init(timeseed());
+
+ m_counter=0;
+ m_level=rgen.frand2();
+ m_slope=0;
+ m_curve=0;
+ m_nextvalue=0;
+ m_nextmidpt=0;
+
+ AddOutSignal();
+}
+
+void LFNoise2_ar::m_dsp(int n, t_sample *const *in,
+ t_sample *const *out)
+{
+ m_sr = Samplerate();
+}
+
+
+void LFNoise2_ar::m_signal(int n, t_sample *const *in,
+ t_sample *const *out)
+{
+ t_sample *nout = *out;
+
+ float level = m_level;
+ int32 counter = m_counter;
+ float slope = m_slope;
+ float curve = m_curve;
+
+ RGET;
+
+ int remain = n;
+ do
+ {
+ if (counter<=0)
+ {
+ float value = m_nextvalue;
+ m_nextvalue = frand2(s1,s2,s3);
+ level = m_nextmidpt;
+ m_nextmidpt = (m_nextvalue + value) * .5;
+
+ counter = (int32)(m_sr / sc_max(m_freq, .001f));
+ counter = sc_max(2, counter);
+ float fseglen = (float)counter;
+ curve = 2.f * (m_nextmidpt - level - fseglen * slope)
+ / (fseglen * fseglen + fseglen);
+ }
+ int nsmps = sc_min(remain, counter);
+ remain -= nsmps;
+ counter -= nsmps;
+
+ for (int i = 0; i!= nsmps;++i)
+ {
+ (*(nout)++)=level;
+ slope+=curve;
+ level+=slope;
+ }
+ }
+ while(remain);
+
+ m_level = level;
+ m_counter = counter;
+ m_slope = slope;
+ m_curve = curve;
+
+ RPUT;
+}
+
+
+/* ------------------------ LFNoise2 ---------------------------------*/
+
+class LFNoise2_kr:
+ public flext_base
+{
+ FLEXT_HEADER(LFNoise2_kr,flext_base);
+
+public:
+ LFNoise2_kr(int argc, t_atom *argv);
+
+protected:
+ void m_perform(void*);
+
+ void m_seed(int i)
+ {
+ rgen.init(i);
+ }
+
+ void m_set(float);
+
+private:
+ RGen rgen;
+ float m_level;
+ float m_slope;
+ float m_curve;
+ float m_nextvalue;
+ float m_nextmidpt;
+
+ float dt; //in s
+ float tick; //in s
+ int counter;
+
+ Timer m_timer;
+ FLEXT_CALLBACK_I(m_seed);
+ FLEXT_CALLBACK_T(m_perform);
+ FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_V("LFNoise2",LFNoise2_kr);
+
+LFNoise2_kr::LFNoise2_kr(int argc, t_atom *argv)
+ : tick(0.01)
+{
+ FLEXT_ADDMETHOD_(0,"seed",m_seed);
+ FLEXT_ADDMETHOD_(0,"set",m_set);
+ FLEXT_ADDTIMER(m_timer,m_perform);
+
+ //parse arguments
+ AtomList Args(argc,argv);
+
+ rgen.init(timeseed());
+
+ m_level=rgen.frand2();
+
+ AddOutFloat();
+
+ m_set(sc_getfloatarg(Args,0));
+}
+
+
+void LFNoise2_kr::m_set(float f)
+{
+ dt = sc_max(1/f, .001f);
+ counter = (dt/tick);
+ counter = sc_max(2, counter);
+
+ float value = m_nextvalue;
+ m_nextvalue = rgen.frand2();
+ m_level = m_nextmidpt;
+ m_nextmidpt = (m_nextvalue + value) * .5;
+
+ float fseglen = (float)counter;
+ m_curve = 2.f * (m_nextmidpt - m_level - fseglen * m_slope)
+ / (fseglen * fseglen + fseglen);
+
+
+ m_timer.Reset();
+ m_timer.Delay(tick);
+}
+
+void LFNoise2_kr::m_perform(void*)
+{
+ m_slope+=m_curve;
+ m_level+=m_slope;
+ ToOutFloat(0,m_level);
+ if (--counter)
+ {
+ m_timer.Reset();
+ m_timer.Delay(tick);
+ }
+ else
+ {
+ counter = (dt/tick);
+
+ counter = sc_max(2, counter);
+
+ float value = m_nextvalue;
+ m_nextvalue = rgen.frand2();
+ m_level = m_nextmidpt;
+ m_nextmidpt = (m_nextvalue + value) * .5;
+
+ float fseglen = (float)counter;
+ m_curve = 2.f * (m_nextmidpt - m_level - fseglen * m_slope) /
+ (fseglen * fseglen + fseglen);
+
+ m_timer.Reset();
+ m_timer.Delay(tick);
+
+ }
+}
+
diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp
index 5940253..0ce8b16 100644
--- a/sc4pd/source/main.cpp
+++ b/sc4pd/source/main.cpp
@@ -57,7 +57,7 @@ void sc4pd_library_setup()
"PinkNoise(~), \n Crackle(~), Rand(~), TRand(~), "
"TExpRand(~), IRand(~), TIRand(~),\n CoinGate, "
"LinRand(~), NRand(~), ExpRand(~), LFClipNoise(~),\n"
- " LFNoise0(~)\n");
+ " LFNoise0(~), LFNoise1(~), LFNoise2\n");
//initialize objects
FLEXT_DSP_SETUP(Dust_ar);
@@ -124,6 +124,12 @@ void sc4pd_library_setup()
FLEXT_DSP_SETUP(LFNoise0_ar);
FLEXT_SETUP(LFNoise0_kr);
+
+ FLEXT_DSP_SETUP(LFNoise1_ar);
+ FLEXT_SETUP(LFNoise1_kr);
+
+ FLEXT_DSP_SETUP(LFNoise2_ar);
+ FLEXT_SETUP(LFNoise2_kr);
}
FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 05:07:51 +0000