From c1313aea8746276cc4de4dbd177f6bf732db2a05 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 25 Jan 2003 04:41:32 +0000 Subject: "" svn path=/trunk/; revision=361 --- externals/grill/deljoin/deljoin.cw | Bin 95001 -> 141089 bytes externals/grill/deljoin/main.cpp | 4 +- externals/grill/delsplit/delsplit.cw | Bin 94699 -> 141089 bytes externals/grill/delsplit/main.cpp | 4 +- externals/grill/fftease/fftease.cw | Bin 203740 -> 207912 bytes externals/grill/fftease/fftease.dsp | 4 ++ externals/grill/fftease/src/burrow~.cpp | 2 +- externals/grill/fftease/src/dentist~.cpp | 2 +- externals/grill/fftease/src/disarray~.cpp | 2 +- externals/grill/fftease/src/ether~.cpp | 2 +- externals/grill/fftease/src/fftease.cpp | 2 +- externals/grill/fftease/src/leanconvert.c | 4 +- externals/grill/fftease/src/main.h | 7 +-- externals/grill/fftease/src/morphine~.cpp | 2 +- externals/grill/fftease/src/shapee~.cpp | 2 +- externals/grill/fftease/src/swinger~.cpp | 2 +- externals/grill/fftease/src/taint~.cpp | 2 +- externals/grill/fftease/src/thresher~.cpp | 4 +- externals/grill/fftease/src/vacancy~.cpp | 2 +- externals/grill/fftease/src/xsyn~.cpp | 2 +- externals/grill/flext/flext.cw | Bin 319687 -> 378067 bytes externals/grill/flext/source/flbase.h | 10 ++-- externals/grill/flext/tutorial/adv1/adv1.cw | Bin 102477 -> 146697 bytes externals/grill/flext/tutorial/thread1/thread1.cw | Bin 68426 -> 149552 bytes externals/grill/flext/tutorial/thread2/thread2.cw | Bin 68426 -> 148836 bytes externals/grill/namedobjs/main.cpp | 54 ++++++++-------------- externals/grill/namedobjs/namedobjs.cw | Bin 98529 -> 144679 bytes externals/grill/pool/pool.cw | Bin 131746 -> 202236 bytes externals/grill/vasp/vasp.cw | Bin 168240 -> 172574 bytes externals/grill/xsample/xsample.cw | Bin 153773 -> 154329 bytes 30 files changed, 48 insertions(+), 65 deletions(-) diff --git a/externals/grill/deljoin/deljoin.cw b/externals/grill/deljoin/deljoin.cw index 51085289..b59fcebf 100755 Binary files a/externals/grill/deljoin/deljoin.cw and b/externals/grill/deljoin/deljoin.cw differ diff --git a/externals/grill/deljoin/main.cpp b/externals/grill/deljoin/main.cpp index 1b02842d..0554bf8a 100755 --- a/externals/grill/deljoin/main.cpp +++ b/externals/grill/deljoin/main.cpp @@ -52,7 +52,7 @@ protected: virtual void m_help(); private: - static V Setup(t_class *c); + static V Setup(t_classid c); FLEXT_CALLBACK_A(m_list) FLEXT_CALLBACK_S(m_del) @@ -61,7 +61,7 @@ private: FLEXT_NEW_V("deljoin",deljoin) -V deljoin::Setup(t_class *c) +V deljoin::Setup(t_classid c) { FLEXT_CADDMETHOD(c,0,m_list); FLEXT_CADDMETHOD(c,1,m_del); diff --git a/externals/grill/delsplit/delsplit.cw b/externals/grill/delsplit/delsplit.cw index 8a4a41ac..e6bc0900 100755 Binary files a/externals/grill/delsplit/delsplit.cw and b/externals/grill/delsplit/delsplit.cw differ diff --git a/externals/grill/delsplit/main.cpp b/externals/grill/delsplit/main.cpp index 9880bf63..bfd2b52c 100755 --- a/externals/grill/delsplit/main.cpp +++ b/externals/grill/delsplit/main.cpp @@ -54,7 +54,7 @@ protected: static V SetAtom(t_atom &l,const C *s); private: - static V Setup(t_class *c); + static V Setup(t_classid c); FLEXT_CALLBACK_S(m_list) FLEXT_CALLBACK_S(m_del) @@ -63,7 +63,7 @@ private: FLEXT_NEW_V("delsplit",delsplit) -V delsplit::Setup(t_class *c) +V delsplit::Setup(t_classid c) { FLEXT_CADDMETHOD(c,0,m_list); FLEXT_CADDMETHOD(c,1,m_del); diff --git a/externals/grill/fftease/fftease.cw b/externals/grill/fftease/fftease.cw index 8644858e..10939532 100755 Binary files a/externals/grill/fftease/fftease.cw and b/externals/grill/fftease/fftease.cw differ diff --git a/externals/grill/fftease/fftease.dsp b/externals/grill/fftease/fftease.dsp index 6f82a52b..7bcfceab 100644 --- a/externals/grill/fftease/fftease.dsp +++ b/externals/grill/fftease/fftease.dsp @@ -152,6 +152,10 @@ SOURCE=.\src\morphine~.cpp # End Source File # Begin Source File +SOURCE=.\src\pvoc~.cpp +# End Source File +# Begin Source File + SOURCE=.\src\scrape~.cpp # End Source File # Begin Source File diff --git a/externals/grill/fftease/src/burrow~.cpp b/externals/grill/fftease/src/burrow~.cpp index 36873a5d..1e42c656 100644 --- a/externals/grill/fftease/src/burrow~.cpp +++ b/externals/grill/fftease/src/burrow~.cpp @@ -88,7 +88,7 @@ burrow::burrow(I argc,const t_atom *argv): } -V burrow::Transform(I _N,S *const *in) +V burrow::Transform(I _N,S *const *) { register const F thr = _threshold,mul = _multiplier; diff --git a/externals/grill/fftease/src/dentist~.cpp b/externals/grill/fftease/src/dentist~.cpp index 3cdcfd90..59d56780 100644 --- a/externals/grill/fftease/src/dentist~.cpp +++ b/externals/grill/fftease/src/dentist~.cpp @@ -123,7 +123,7 @@ V dentist::Set() ms_knee(_knee); } -V dentist::Transform(I _N,S *const *in) +V dentist::Transform(I _N,S *const *) { const BL *bs = _bin_selection; for(I i = 0; i < _N ; i += 2) diff --git a/externals/grill/fftease/src/disarray~.cpp b/externals/grill/fftease/src/disarray~.cpp index 01e67226..3fe290b1 100644 --- a/externals/grill/fftease/src/disarray~.cpp +++ b/externals/grill/fftease/src/disarray~.cpp @@ -134,7 +134,7 @@ V disarray::ms_freq(F f) inline V swap(F &a,F &b) { F t = a; a = b; b = t; } inline V swap(I &a,I &b) { I t = a; a = b; b = t; } -V disarray::Transform(I _N,S *const *in) +V disarray::Transform(I _N,S *const *) { I shcnt = _shuffle_count; if(shcnt < 0) shcnt = 0; diff --git a/externals/grill/fftease/src/ether~.cpp b/externals/grill/fftease/src/ether~.cpp index 80cd2df2..0e9803f0 100644 --- a/externals/grill/fftease/src/ether~.cpp +++ b/externals/grill/fftease/src/ether~.cpp @@ -66,7 +66,7 @@ ether::ether(I argc,const t_atom *argv): } -V ether::Transform(I _N,S *const *in) +V ether::Transform(I _N,S *const *) { const BL inv = _invert; const F threshMult = _threshMult?_threshMult:1; diff --git a/externals/grill/fftease/src/fftease.cpp b/externals/grill/fftease/src/fftease.cpp index 23d07491..378ae8ce 100644 --- a/externals/grill/fftease/src/fftease.cpp +++ b/externals/grill/fftease/src/fftease.cpp @@ -33,7 +33,7 @@ V fftease::Exit() Delete(); } -V fftease::m_dsp(I n,S *const *in,S *const *out) +V fftease::m_dsp(I n,S *const *,S *const *) { const I _D = n; const F sr = Samplerate(); diff --git a/externals/grill/fftease/src/leanconvert.c b/externals/grill/fftease/src/leanconvert.c index 0c567ca8..d121d896 100644 --- a/externals/grill/fftease/src/leanconvert.c +++ b/externals/grill/fftease/src/leanconvert.c @@ -5,8 +5,8 @@ void leanconvert( float *S, float *C, int N2 , int amp, int ph) #if 1 register int i; - float a = fabs(S[0]); // real value at f=0 - float b = fabs(S[1]); // real value at f=Nyquist + float a = fabs(S[0]); /* real value at f=0 */ + float b = fabs(S[1]); /* real value at f=Nyquist */ C[0] = a; C[1] = 0; diff --git a/externals/grill/fftease/src/main.h b/externals/grill/fftease/src/main.h index 9f016115..18a36bc0 100644 --- a/externals/grill/fftease/src/main.h +++ b/externals/grill/fftease/src/main.h @@ -41,7 +41,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. class fftease: public flext_dsp { - FLEXT_HEADER_S(fftease,flext_dsp,setup) + FLEXT_HEADER(fftease,flext_dsp) public: fftease(I mult,I flags); @@ -91,7 +91,7 @@ protected: F_NOAMP1 = 0x100, F_NOPH1 = 0x200, F_NOAMP2 = 0x400, - F_NOPH2 = 0x800, + F_NOPH2 = 0x800 }; I _flags; @@ -104,9 +104,6 @@ private: I blsz; F smprt; I _mult,_N; - - static V setup(t_classid c) {} - }; diff --git a/externals/grill/fftease/src/morphine~.cpp b/externals/grill/fftease/src/morphine~.cpp index 23c2cca9..813629ab 100644 --- a/externals/grill/fftease/src/morphine~.cpp +++ b/externals/grill/fftease/src/morphine~.cpp @@ -93,7 +93,7 @@ I morphine::sortpicks( const void *a, const void *b ) return 0; } -V morphine::Transform(I _N,S *const *in) +V morphine::Transform(I _N,S *const *) { const I _N2 = _N/2; I i; diff --git a/externals/grill/fftease/src/shapee~.cpp b/externals/grill/fftease/src/shapee~.cpp index b42ba46f..657a646b 100644 --- a/externals/grill/fftease/src/shapee~.cpp +++ b/externals/grill/fftease/src/shapee~.cpp @@ -56,7 +56,7 @@ shapee::shapee(I argc,const t_atom *argv): #define THRESH 0.000001 -V shapee::Transform(I _N,S *const *in) +V shapee::Transform(I _N,S *const *) { // lets just shape the entire signal in groups of three diff --git a/externals/grill/fftease/src/swinger~.cpp b/externals/grill/fftease/src/swinger~.cpp index 143bf5de..1f0cc21a 100644 --- a/externals/grill/fftease/src/swinger~.cpp +++ b/externals/grill/fftease/src/swinger~.cpp @@ -58,7 +58,7 @@ swinger::swinger(I argc,const t_atom *argv): } -V swinger::Transform(I _N,S *const *in) +V swinger::Transform(I _N,S *const *) { for (I i = 0; i <= _N; i += 2) _channel1[i+1] = _channel2[i+1]; } diff --git a/externals/grill/fftease/src/taint~.cpp b/externals/grill/fftease/src/taint~.cpp index 82c38f0e..797b2d5d 100644 --- a/externals/grill/fftease/src/taint~.cpp +++ b/externals/grill/fftease/src/taint~.cpp @@ -74,7 +74,7 @@ taint::taint(I argc,const t_atom *argv): } -V taint::Transform(I _N,S *const *in) +V taint::Transform(I _N,S *const *) { register const F thr = _threshold; diff --git a/externals/grill/fftease/src/thresher~.cpp b/externals/grill/fftease/src/thresher~.cpp index 98c02eb1..29b042be 100644 --- a/externals/grill/fftease/src/thresher~.cpp +++ b/externals/grill/fftease/src/thresher~.cpp @@ -41,7 +41,7 @@ private: FLEXT_LIB_DSP("fftease, thresher~ nacho~",thresher) -V thresher::setup(t_classid c) +V thresher::setup(t_classid ) { } @@ -84,7 +84,7 @@ thresher::thresher(): } -V thresher::Transform(I _N,S *const *in) +V thresher::Transform(I _N,S *const *) { I *fr = _framesLeft; if( _firstFrame ) { diff --git a/externals/grill/fftease/src/vacancy~.cpp b/externals/grill/fftease/src/vacancy~.cpp index 881a3ca2..9c4b7eb2 100644 --- a/externals/grill/fftease/src/vacancy~.cpp +++ b/externals/grill/fftease/src/vacancy~.cpp @@ -94,7 +94,7 @@ vacancy::vacancy(I argc,const t_atom *argv): } -V vacancy::Transform(I _N,S *const *in) +V vacancy::Transform(I _N,S *const *) { const F useme = _useRms?_rms * _threshold:_threshold; diff --git a/externals/grill/fftease/src/xsyn~.cpp b/externals/grill/fftease/src/xsyn~.cpp index 89e84868..cab487c9 100644 --- a/externals/grill/fftease/src/xsyn~.cpp +++ b/externals/grill/fftease/src/xsyn~.cpp @@ -36,7 +36,7 @@ xsyn::xsyn(): } -V xsyn::Transform(I _N,S *const *in) +V xsyn::Transform(I _N,S *const *) { F maxamp = 0; I i; diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw index 302b54b4..fc361197 100644 Binary files a/externals/grill/flext/flext.cw and b/externals/grill/flext/flext.cw differ diff --git a/externals/grill/flext/source/flbase.h b/externals/grill/flext/source/flbase.h index d72466c5..97e5f2b6 100644 --- a/externals/grill/flext/source/flbase.h +++ b/externals/grill/flext/source/flbase.h @@ -449,7 +449,7 @@ fts_module_t __##NAME##_module = {#NAME,#NAME,__##NAME##_initfun,0,0}; #define REAL_NEW(NAME,NEW_CLASS,DSP,LIB) \ -flext_obj *NEW_CLASS::__init__(int argc,t_atom *argv) \ +flext_obj *NEW_CLASS::__init__(int ,t_atom *) \ { \ return new NEW_CLASS; \ } \ @@ -471,7 +471,7 @@ FLEXT_EXP(LIB) void FLEXT_STPF(NEW_CLASS,DSP)() \ FLEXT_OBJ_SETUP(NEW_CLASS,DSP,LIB) #define REAL_NEW_1(NAME,NEW_CLASS,DSP,LIB, TYPE1) \ -flext_obj *NEW_CLASS::__init__(int argc,t_atom *argv) \ +flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1)); \ } \ @@ -482,7 +482,7 @@ FLEXT_EXP(LIB) void FLEXT_STPF(NEW_CLASS,DSP)() \ FLEXT_OBJ_SETUP(NEW_CLASS,DSP,LIB) #define REAL_NEW_2(NAME,NEW_CLASS,DSP,LIB, TYPE1,TYPE2) \ -flext_obj *NEW_CLASS::__init__(int argc,t_atom *argv) \ +flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2)); \ } \ @@ -493,7 +493,7 @@ FLEXT_EXP(LIB) void FLEXT_STPF(NEW_CLASS,DSP)() \ FLEXT_OBJ_SETUP(NEW_CLASS,DSP,LIB) #define REAL_NEW_3(NAME,NEW_CLASS,DSP,LIB, TYPE1, TYPE2, TYPE3) \ -flext_obj *NEW_CLASS::__init__(int argc,t_atom *argv) \ +flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2),ARGCAST(argv[2],TYPE3)); \ } \ @@ -504,7 +504,7 @@ FLEXT_EXP(LIB) void FLEXT_STPF(NEW_CLASS,DSP)() \ FLEXT_OBJ_SETUP(NEW_CLASS,DSP,LIB) #define REAL_NEW_4(NAME,NEW_CLASS,DSP,LIB, TYPE1,TYPE2, TYPE3, TYPE4) \ -flext_obj *NEW_CLASS::__init__(int argc,t_atom *argv) \ +flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2),ARGCAST(argv[2],TYPE3),ARGCAST(argv[3],TYPE4)); \ } \ diff --git a/externals/grill/flext/tutorial/adv1/adv1.cw b/externals/grill/flext/tutorial/adv1/adv1.cw index 08e0dff0..52ef4c98 100755 Binary files a/externals/grill/flext/tutorial/adv1/adv1.cw and b/externals/grill/flext/tutorial/adv1/adv1.cw differ diff --git a/externals/grill/flext/tutorial/thread1/thread1.cw b/externals/grill/flext/tutorial/thread1/thread1.cw index 1d4b813b..54fc8624 100644 Binary files a/externals/grill/flext/tutorial/thread1/thread1.cw and b/externals/grill/flext/tutorial/thread1/thread1.cw differ diff --git a/externals/grill/flext/tutorial/thread2/thread2.cw b/externals/grill/flext/tutorial/thread2/thread2.cw index 346a25b1..9d051153 100755 Binary files a/externals/grill/flext/tutorial/thread2/thread2.cw and b/externals/grill/flext/tutorial/thread2/thread2.cw differ diff --git a/externals/grill/namedobjs/main.cpp b/externals/grill/namedobjs/main.cpp index 7a7811f4..cad037e8 100755 --- a/externals/grill/namedobjs/main.cpp +++ b/externals/grill/namedobjs/main.cpp @@ -1,8 +1,8 @@ /* -namedobjs - retrieve list of named objects in patcher (MaxMSP only!) +namedobjs - retrieve list of named objects in patcher (Max/MSP only!) -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 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. @@ -10,11 +10,11 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include -#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 203) -#error You need at least flext version 0.2.3 +#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 401) +#error You need at least flext version 0.4.1 #endif -#ifndef MAXMSP +#if FLEXT_SYS != FLEXT_SYS_MAX #error "This object is for MaxMSP only!" #endif @@ -29,30 +29,32 @@ WARRANTIES, see the file, "license.txt," in this distribution. class namedobjs: public flext_base { - FLEXT_HEADER(namedobjs,flext_base) + FLEXT_HEADER_S(namedobjs,flext_base,Setup) public: - namedobjs(I argc,t_atom *argv); + namedobjs(); protected: V m_bang(); - virtual V m_assist(L msg,L arg,C *s); private: + static V Setup(t_classid c); + FLEXT_CALLBACK(m_bang); }; -FLEXT_NEW_G("namedobjs",namedobjs) +FLEXT_NEW("namedobjs",namedobjs) +V namedobjs::Setup(t_classid c) +{ + FLEXT_CADDBANG(c,0,m_bang); +} -namedobjs::namedobjs(I argc,t_atom *argv) +namedobjs::namedobjs() { - AddInAnything(); - AddOutList(); - AddOutBang(); - SetupInOut(); - - FLEXT_ADDBANG(0,m_bang); + AddInAnything("Bang to retrieve list of named objects"); + AddOutList("Consecutive object type/name pairs"); + AddOutBang("Bang signals end of list"); } V namedobjs::m_bang() @@ -89,24 +91,4 @@ V namedobjs::m_bang() ToOutBang(1); } -V namedobjs::m_assist(L msg,L arg,C *s) -{ - switch(msg) { - case 1: //ASSIST_INLET: - switch(arg) { - case 0: - sprintf(s,"Bang to retrieve list of named objects"); break; - } - break; - case 2: //ASSIST_OUTLET: - switch(arg) { - case 0: - sprintf(s,"Consecutive object type/name pairs"); break; - case 1: - sprintf(s,"Bang signals end of list"); break; - } - break; - } -} - diff --git a/externals/grill/namedobjs/namedobjs.cw b/externals/grill/namedobjs/namedobjs.cw index 6bf839a1..7e95ad83 100755 Binary files a/externals/grill/namedobjs/namedobjs.cw and b/externals/grill/namedobjs/namedobjs.cw differ diff --git a/externals/grill/pool/pool.cw b/externals/grill/pool/pool.cw index 5c72ed40..a42f2abf 100755 Binary files a/externals/grill/pool/pool.cw and b/externals/grill/pool/pool.cw differ diff --git a/externals/grill/vasp/vasp.cw b/externals/grill/vasp/vasp.cw index d9bf60d3..9a412147 100644 Binary files a/externals/grill/vasp/vasp.cw and b/externals/grill/vasp/vasp.cw differ diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw index 88559b7b..5b709e4f 100755 Binary files a/externals/grill/xsample/xsample.cw and b/externals/grill/xsample/xsample.cw differ -- cgit v1.2.1