[PD-cvs] externals/sc4pd/source LFPulse.cpp,NONE,1.1 LFSaw.cpp,NONE,1.1 main.cpp,1.10,1.11 support.hpp,1.3,1.4

Tim Blechmann timblech at users.sourceforge.net
Sun Aug 1 21:00:32 CEST 2004


Update of /cvsroot/pure-data/externals/sc4pd/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10535/source

Modified Files:
	main.cpp support.hpp 
Added Files:
	LFPulse.cpp LFSaw.cpp 
Log Message:
checkin: lfpulse, lfsaw

Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main.cpp	30 Jul 2004 21:27:07 -0000	1.10
--- main.cpp	1 Aug 2004 19:00:30 -0000	1.11
***************
*** 33,37 ****
       
     Coded while listening to: Phosphor
- 
  */
  
--- 33,36 ----
***************
*** 62,68 ****
  	 "          LinCong(~), amclip(~), scaleneg(~), excess(~), hypot(~), "
  	 "ring1(~),\n"
! 	 "          ring2(~), ring3(~), ring4(~), difsqr(~), sumsqr(~)\n"
! 	 "sqrdif(~), sqrsum(~),\n"
! 	 "          absdif(~)");
  
      //initialize objects
--- 61,67 ----
  	 "          LinCong(~), amclip(~), scaleneg(~), excess(~), hypot(~), "
  	 "ring1(~),\n"
! 	 "          ring2(~), ring3(~), ring4(~), difsqr(~), sumsqr(~), "
! 	 "sqrdif(~),\n"
! 	 "          sqrsum(~), absdif(~), LFSaw(~), LFPulse(~)");
  
      //initialize objects
***************
*** 185,188 ****
--- 184,193 ----
      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);
  }
  

Index: support.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/support.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** support.hpp	15 Jul 2004 19:05:05 -0000	1.3
--- support.hpp	1 Aug 2004 19:00:30 -0000	1.4
***************
*** 65,66 ****
--- 65,95 ----
  
  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 at 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

--- NEW FILE: LFSaw.cpp ---
/* 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 <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


/* ------------------------ 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;
    }
}

--- NEW FILE: LFPulse.cpp ---
/* 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 <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


/* ------------------------ 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);
}





More information about the Pd-cvs mailing list