the work of this evening ...

svn path=/trunk/externals/tb/; revision=1868

11 files changed, 463 insertions, 11 deletions

diff --git a/sc4pd/headers/plugin_interface/SC_RGen.h b/sc4pd/headers/plugin_interface/SC_RGen.h
index c82142b..11f8c9a 100755
--- a/sc4pd/headers/plugin_interface/SC_RGen.h
+++ b/sc4pd/headers/plugin_interface/SC_RGen.h
@@ -165,7 +165,7 @@ inline float RGen::fcoin()
 {
 	// only return one of the two values -1.0 or +1.0
 	union { uint32 i; float f; } u;		// union for floating point conversion of result
-	u.i = 0x3E000000 | (0x80000000 & trand());
+	u.i = 0x3F800000 | (0x80000000 & trand());
 	return u.f;
 }
 
diff --git a/sc4pd/make-files.txt b/sc4pd/make-files.txt
index 7bd3221..4f7f78a 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\
-	
\ No newline at end of file
+	ExpRand.cpp LFClipNoise.cpp LFNoise0.cpp
\ No newline at end of file
diff --git a/sc4pd/pd/clipnoise.pd b/sc4pd/pd/clipnoise.pd
new file mode 100644
index 0000000..5a685b0
--- /dev/null
+++ b/sc4pd/pd/clipnoise.pd
@@ -0,0 +1,13 @@
+#N canvas 0 0 450 300 10;
+#X obj 89 48 ClipNoise~;
+#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 obj 246 55 ClipNoise;
+#X floatatom 246 97 5 0 0 0 - - -;
+#X obj 251 27 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
+-1;
+#X connect 0 0 1 0;
+#X connect 2 0 1 0;
+#X connect 3 0 4 0;
+#X connect 5 0 3 0;
diff --git a/sc4pd/pd/lfclipnoise.pd b/sc4pd/pd/lfclipnoise.pd
new file mode 100644
index 0000000..a4c3496
--- /dev/null
+++ b/sc4pd/pd/lfclipnoise.pd
@@ -0,0 +1,10 @@
+#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 89 48 LFClipNoise~ 1000;
+#X obj 246 55 LFClipNoise 10;
+#X connect 1 0 0 0;
+#X connect 3 0 0 0;
+#X connect 4 0 2 0;
diff --git a/sc4pd/pd/lfnoise0.pd b/sc4pd/pd/lfnoise0.pd
new file mode 100644
index 0000000..882d0dd
--- /dev/null
+++ b/sc4pd/pd/lfnoise0.pd
@@ -0,0 +1,10 @@
+#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 55 LFNoise0 10;
+#X obj 89 48 LFNoise0~ 1000;
+#X connect 1 0 0 0;
+#X connect 3 0 2 0;
+#X connect 4 0 0 0;
diff --git a/sc4pd/source/ClipNoise.cpp b/sc4pd/source/ClipNoise.cpp
index 891342c..761fbb6 100644
--- a/sc4pd/source/ClipNoise.cpp
+++ b/sc4pd/source/ClipNoise.cpp
@@ -134,10 +134,10 @@ ClipNoise_kr::ClipNoise_kr(int argc, t_atom *argv)
     
     rgen.init(timeseed());
 
-    AddOutFloat();
+    AddOutInt();
 }
 
 void ClipNoise_kr::m_perform()
 {
-    ToOutFloat(0,rgen.fcoin());
+    ToOutInt(0,rgen.fcoin());
 }
diff --git a/sc4pd/source/ExpRand.cpp b/sc4pd/source/ExpRand.cpp
index e0718c8..3b17aef 100644
--- a/sc4pd/source/ExpRand.cpp
+++ b/sc4pd/source/ExpRand.cpp
@@ -97,7 +97,7 @@ ExpRand_ar::ExpRand_ar(int argc, t_atom *argv)
 void ExpRand_ar::m_dsp(int n, t_sample *const *in, t_sample *const *out)
 {
     float ratio = hi / lo;
-    m_sample = pow(ratio,rgen.frand()) * lo);
+    m_sample = pow(ratio,rgen.frand()) * lo;
 }
 
 
diff --git a/sc4pd/source/LFClipNoise.cpp b/sc4pd/source/LFClipNoise.cpp
new file mode 100644
index 0000000..9aa6dfc
--- /dev/null
+++ b/sc4pd/source/LFClipNoise.cpp
@@ -0,0 +1,202 @@
+/* sc4pd 
+   LFClipNoise, LFClipNoise~
+
+   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: Elliott Sharp: Revenge Of The Stuttering Child
+   
+*/
+
+#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
+
+
+/* ------------------------ LFClipNoise~ -------------------------------*/
+
+class LFClipNoise_ar:
+    public flext_dsp
+{
+    FLEXT_HEADER(LFClipNoise_ar,flext_dsp);
+    
+public:
+    LFClipNoise_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;
+    int m_counter;
+    int m_sr;
+    FLEXT_CALLBACK_I(m_seed);
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("LFClipNoise~",LFClipNoise_ar);
+
+LFClipNoise_ar::LFClipNoise_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);
+    
+    m_counter=0;
+    m_level=0;
+
+    rgen.init(timeseed());
+
+    AddOutSignal();
+}    
+
+void LFClipNoise_ar::m_dsp(int n, t_sample *const *in, 
+			   t_sample *const *out)
+{
+    m_sr = Samplerate();
+}
+
+
+void LFClipNoise_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;
+
+    RGET;
+
+    int remain = n;
+    do
+    {
+	if (counter<=0) 
+	{
+	    counter = (int)(m_sr / sc_max(m_freq, .001f));
+	    counter = sc_max(1, counter);
+	    level = fcoin(s1,s2,s3);
+	}
+	int nsmps = sc_min(remain, counter);
+	remain -= nsmps;
+	counter -= nsmps;
+	
+	for (int i = 0; i!= nsmps;++i)
+	{
+	    (*(nout)++)=level;
+	}
+    }
+    while(remain);
+
+    m_level = level;
+    m_counter = counter;
+    
+    RPUT;
+}
+
+
+/* ------------------------ LFClipNoise ---------------------------------*/
+
+class LFClipNoise_kr:
+    public flext_base
+{
+    FLEXT_HEADER(LFClipNoise_kr,flext_base);
+
+public:
+    LFClipNoise_kr(int argc, t_atom *argv);
+    
+protected:
+    void m_perform();
+    
+    void m_seed(int i)
+    {
+	rgen.init(i);
+    }
+ 
+    void m_set(float f)
+    {
+	double dt = sc_min(1/f, .001f);
+	m_timer.Reset();
+	m_timer.Periodic(1000*dt);
+    }
+   
+private:
+    RGen rgen;
+    Timer m_timer;
+    FLEXT_CALLBACK_I(m_seed);
+    FLEXT_CALLBACK_T(m_perform);
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_V("LFClipNoise",LFClipNoise_kr);
+
+LFClipNoise_kr::LFClipNoise_kr(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"seed",m_seed);
+    FLEXT_ADDMETHOD_(0,"set",m_set);
+    FLEXT_ADDTIMER(m_timer,m_perform);
+    
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    double dt = sc_min(1/sc_getfloatarg(Args,0), .001f);
+    
+    rgen.init(timeseed());
+
+    m_timer.Periodic(1000*dt);
+
+    AddOutFloat();
+}
+
+void LFClipNoise_kr::m_perform()
+{
+    ToOutFloat(0,rgen.fcoin());
+}
diff --git a/sc4pd/source/LFNoise0.cpp b/sc4pd/source/LFNoise0.cpp
new file mode 100644
index 0000000..6e9c5bb
--- /dev/null
+++ b/sc4pd/source/LFNoise0.cpp
@@ -0,0 +1,202 @@
+/* sc4pd 
+   LFNoise0, LFNoise0~
+
+   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: Elliott Sharp: Revenge Of The Stuttering Child
+   
+*/
+
+#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
+
+
+/* ------------------------ LFNoise0~ -------------------------------*/
+
+class LFNoise0_ar:
+    public flext_dsp
+{
+    FLEXT_HEADER(LFNoise0_ar,flext_dsp);
+    
+public:
+    LFNoise0_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;
+    int m_counter;
+    int m_sr;
+    FLEXT_CALLBACK_I(m_seed);
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_DSP_V("LFNoise0~",LFNoise0_ar);
+
+LFNoise0_ar::LFNoise0_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);
+    
+    m_counter=0;
+    m_level=0;
+
+    rgen.init(timeseed());
+
+    AddOutSignal();
+}    
+
+void LFNoise0_ar::m_dsp(int n, t_sample *const *in, 
+			   t_sample *const *out)
+{
+    m_sr = Samplerate();
+}
+
+
+void LFNoise0_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;
+
+    RGET;
+
+    int remain = n;
+    do
+    {
+	if (counter<=0) 
+	{
+	    counter = (int)(m_sr / sc_max(m_freq, .001f));
+	    counter = sc_max(1, counter);
+	    level = frand2(s1,s2,s3);
+	}
+	int nsmps = sc_min(remain, counter);
+	remain -= nsmps;
+	counter -= nsmps;
+	
+	for (int i = 0; i!= nsmps;++i)
+	{
+	    (*(nout)++)=level;
+	}
+    }
+    while(remain);
+
+    m_level = level;
+    m_counter = counter;
+    
+    RPUT;
+}
+
+
+/* ------------------------ LFNoise0 ---------------------------------*/
+
+class LFNoise0_kr:
+    public flext_base
+{
+    FLEXT_HEADER(LFNoise0_kr,flext_base);
+
+public:
+    LFNoise0_kr(int argc, t_atom *argv);
+    
+protected:
+    void m_perform();
+    
+    void m_seed(int i)
+    {
+	rgen.init(i);
+    }
+ 
+    void m_set(float f)
+    {
+	double dt = sc_min(1/f, .001f);
+	m_timer.Reset();
+	m_timer.Periodic(1000*dt);
+    }
+   
+private:
+    RGen rgen;
+    Timer m_timer;
+    FLEXT_CALLBACK_I(m_seed);
+    FLEXT_CALLBACK_T(m_perform);
+    FLEXT_CALLBACK_F(m_set);
+};
+
+FLEXT_LIB_V("LFNoise0",LFNoise0_kr);
+
+LFNoise0_kr::LFNoise0_kr(int argc, t_atom *argv)
+{
+    FLEXT_ADDMETHOD_(0,"seed",m_seed);
+    FLEXT_ADDMETHOD_(0,"set",m_set);
+    FLEXT_ADDTIMER(m_timer,m_perform);
+    
+    //parse arguments
+    AtomList Args(argc,argv);
+    
+    double dt = sc_min(1/sc_getfloatarg(Args,0), .001f);
+    
+    rgen.init(timeseed());
+
+    m_timer.Periodic(1000*dt);
+
+    AddOutFloat();
+}
+
+void LFNoise0_kr::m_perform()
+{
+    ToOutFloat(0,rgen.frand2());
+}
diff --git a/sc4pd/source/main.cpp b/sc4pd/source/main.cpp
index 2de28fa..5940253 100644
--- a/sc4pd/source/main.cpp
+++ b/sc4pd/source/main.cpp
@@ -56,7 +56,8 @@ void sc4pd_library_setup()
 	 "          ClipNoise(~), GrayNoise(~), Dust2(~), WhiteNoise(~), "
 	 "PinkNoise(~), \n          Crackle(~), Rand(~), TRand(~), "
 	 "TExpRand(~), IRand(~), TIRand(~),\n          CoinGate, "
-	 "LinRand(~), NRand(~), ExpRand(~)\n");
+	 "LinRand(~), NRand(~), ExpRand(~), LFClipNoise(~),\n"
+	 "          LFNoise0(~)\n");
 
     //initialize objects
     FLEXT_DSP_SETUP(Dust_ar);
@@ -117,6 +118,12 @@ void sc4pd_library_setup()
 
     FLEXT_DSP_SETUP(ExpRand_ar);
     FLEXT_SETUP(ExpRand_kr);
+
+    FLEXT_DSP_SETUP(LFClipNoise_ar);
+    FLEXT_SETUP(LFClipNoise_kr);
+
+    FLEXT_DSP_SETUP(LFNoise0_ar);
+    FLEXT_SETUP(LFNoise0_kr);
 }
 
 FLEXT_LIB_SETUP(sc4pd,sc4pd_library_setup);
diff --git a/sc4pd/source/support.cpp b/sc4pd/source/support.cpp
index 2e06e9e..8d80bbe 100644
--- a/sc4pd/source/support.cpp
+++ b/sc4pd/source/support.cpp
@@ -35,15 +35,14 @@
 */
 
 #include <flext.h>
+#include <flsupport.h>
 #include "SC_PlugIn.h"
 
-#include <sys/time.h>
 
 #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406)
 #error You need at least FLEXT version 0.4.6
 #endif
 
-
 bool sc_add (flext::AtomList a)
 {
     for (int i = 0; i!=a.Count();++i)
@@ -96,7 +95,16 @@ bool sc_ar(flext::AtomList a)
 int32 timeseed()
 {
 	static int32 count = 0;
-	struct timeval tv;
-	gettimeofday(&tv, 0);
-	return (int32)tv.tv_sec ^ (int32)tv.tv_usec ^ count--;
+
+	double time = flext::GetOSTime();
+	
+	double sec = trunc(time);
+	double usec = (time-sec)*1e6;
+	
+	time_t tsec = sec;
+	suseconds_t tusec =usec;       /* not exacty the way, it's calculated
+					  in SuperCollider, but it's only 
+					  the seed */
+	
+	return (int32)tsec ^ (int32)tusec ^ count--;
 }