[PD-cvs] externals/sc4pd/source Lag.cpp,NONE,1.1 Decay2.cpp,1.1,1.2 main.cpp,1.14,1.15 sc4pd.hpp,1.1,1.2

[Tim Blechmann]

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

Modified Files:
	Decay2.cpp main.cpp sc4pd.hpp 
Added Files:
	Lag.cpp 
Log Message:
lag

Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/main.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** main.cpp	2 Aug 2004 20:13:59 -0000	1.14
--- main.cpp	2 Aug 2004 21:13:50 -0000	1.15
***************
*** 59,63 ****
  	 "sqrdif(~),\n"
  	 "          sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n"
! 	 "          Integrator(~), Decay~, Decay2~\n"
  	 );
  
--- 59,63 ----
  	 "sqrdif(~),\n"
  	 "          sqrsum(~), absdif(~), LFSaw(~), LFPulse(~), Impulse(~),\n"
! 	 "          Integrator(~), Decay~, Decay2~, Lag~\n"
  	 );
  
***************
*** 197,200 ****
--- 197,202 ----
  
      FLEXT_DSP_SETUP(Decay2_ar); 
+ 
+     FLEXT_DSP_SETUP(Lag_ar); 
  }
  

Index: sc4pd.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/sc4pd.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sc4pd.hpp	2 Aug 2004 20:13:59 -0000	1.1
--- sc4pd.hpp	2 Aug 2004 21:13:50 -0000	1.2
***************
*** 49,55 ****
  //#define CALCSLOPE(next,prev) ((next - prev) * unit->mRate->mSlopeFactor)
  #undef CALCSLOPE
! #define CALCSLOPE(next,prev) ((next - prev) * 1/Blocksize())
! 
! 
  
  
--- 49,53 ----
  //#define CALCSLOPE(next,prev) ((next - prev) * unit->mRate->mSlopeFactor)
  #undef CALCSLOPE
! #define CALCSLOPE(next,prev) ((next - prev) * 1/ Blocksize())
  
  

--- NEW FILE: Lag.cpp ---
/* sc4pd 
   Lag~, Lag

   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: VA: Live from the Vision Festival
   
*/

#include "sc4pd.hpp"

/* ------------------------ Lag~ -----------------------------*/

class Lag_ar
    :public flext_dsp
{
    FLEXT_HEADER(Lag_ar,flext_dsp);

public:
    Lag_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_set(float f);

private:
    FLEXT_CALLBACK_F(m_set);
    float m_b1, n_b1;
    float m_y1;
    float m_lag;
    bool changed;
};

FLEXT_LIB_DSP_V("Lag~",Lag_ar);

Lag_ar::Lag_ar(int argc,t_atom * argv)
{
    FLEXT_ADDMETHOD_(0,"lagTime",m_set);

    AtomList Args(argc,argv);

    m_lag = sc_getfloatarg(Args,0);

    AddOutSignal();

    m_y1 = 0.f;
}

void Lag_ar::m_dsp(int n, t_sample *const *in, 
		   t_sample *const *out)
{
    changed = false;
    m_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate()));
}

void Lag_ar::m_signal(int n, t_sample *const *in, 
		      t_sample *const *out)
{
    t_sample *nout = *out;
    t_sample *nin = *in;

    float y1 = m_y1;
    float b1 = m_b1;

    if (changed)
    {
	float b1_slope = CALCSLOPE(m_b1, n_b1);
	m_b1 = n_b1;
	for (int i = 0; i!= n;++i)
	{
	    float y0 = ZXP(nin); 
	    ZXP(nout) = y1 = y0 + b1 * (y1 - y0);
	    b1 += b1_slope;
	}
	changed = false;
    }
    else
    {
	for (int i = 0; i!= n;++i)
	{
	    float y0 = ZXP(nin); 
	    ZXP(nout) = y1 = y0 + b1 * (y1 - y0);
	}
    }
    m_y1 = zapgremlins(y1);
}
    
void Lag_ar::m_set(float f)
{
    m_lag = f;
    n_b1 = m_lag == 0.f ? 0.f : exp(log001 / (m_lag * Samplerate()));
    changed = true;
}

/* todo: does a control rate Lag make sense? */

Index: Decay2.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/sc4pd/source/Decay2.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Decay2.cpp	2 Aug 2004 20:13:59 -0000	1.1
--- Decay2.cpp	2 Aug 2004 21:13:50 -0000	1.2
***************
*** 147,150 ****
--- 147,151 ----
      m_b1b = m_attackTime == 0.f ? 0.f : exp(log001 / 
  					    (m_attackTime * Samplerate()));
+     changed = false;
  }