diff options
| -rwxr-xr-x | externals/grill/deljoin/deljoin.cw | bin | 95001 -> 95001 bytes | |||
| -rwxr-xr-x | externals/grill/deljoin/main.cpp | 29 | ||||
| -rwxr-xr-x | externals/grill/delsplit/delsplit.cw | bin | 94699 -> 94699 bytes | |||
| -rwxr-xr-x | externals/grill/delsplit/main.cpp | 27 | ||||
| -rw-r--r-- | externals/grill/idelay/delay.cpp | 5 | ||||
| -rw-r--r-- | externals/grill/idelay/idelay.cw | bin | 90120 -> 90120 bytes | |||
| -rw-r--r-- | externals/grill/idelay/idelay.dsp | 6 | ||||
| -rwxr-xr-x | externals/grill/pool/pool.cw | bin | 131746 -> 131746 bytes | |||
| -rw-r--r-- | externals/grill/pool/pool.dsp | 2 | ||||
| -rw-r--r-- | externals/grill/prepend/prepend.dsp | 8 | ||||
| -rw-r--r-- | externals/grill/vasp/vasp.cw | bin | 142172 -> 142172 bytes | |||
| -rw-r--r-- | externals/grill/xsample/source/groove.cpp | 60 | ||||
| -rw-r--r-- | externals/grill/xsample/source/play.cpp | 34 | ||||
| -rw-r--r-- | externals/grill/xsample/source/record.cpp | 63 |
14 files changed, 51 insertions, 183 deletions
diff --git a/externals/grill/deljoin/deljoin.cw b/externals/grill/deljoin/deljoin.cw Binary files differindex 452dac9b..51085289 100755 --- a/externals/grill/deljoin/deljoin.cw +++ b/externals/grill/deljoin/deljoin.cw diff --git a/externals/grill/deljoin/main.cpp b/externals/grill/deljoin/main.cpp index 5dfdff5f..a6357163 100755 --- a/externals/grill/deljoin/main.cpp +++ b/externals/grill/deljoin/main.cpp @@ -50,7 +50,6 @@ protected: const t_symbol *delim; virtual void m_help(); - virtual void m_assist(long /*msg*/,long /*arg*/,char * /*s*/); private: static V Setup(t_class *c); @@ -64,16 +63,16 @@ FLEXT_NEW_V("deljoin",deljoin) V deljoin::Setup(t_class *c) { - FLEXT_CADDMETHOD_A(c,0,m_list); + FLEXT_CADDMETHOD(c,0,m_list); FLEXT_CADDMETHOD(c,1,m_del); } deljoin::deljoin(I argc,const t_atom *argv): delim(NULL) { - AddInAnything(); - AddInSymbol(); - AddOutSymbol(); + AddInAnything("Anything in - triggers output"); + AddInSymbol("Set the Delimiter"); + AddOutSymbol("A symbol representing the joined list"); if(argc && IsSymbol(argv[0])) delim = GetSymbol(argv[0]); } @@ -82,26 +81,6 @@ V deljoin::m_help() { post("%s version " VERSION " (using flext " FLEXT_VERSTR "), (C) 2002 Thomas Grill",thisName()); } - -V deljoin::m_assist(long msg,long arg,char *s) -{ - switch(msg) { - case 1: //ASSIST_INLET: - switch(arg) { - case 0: - STD::sprintf(s,"Anything in - triggers output"); break; - case 1: - STD::sprintf(s,"Set the Delimiter"); break; - } - break; - case 2: //ASSIST_OUTLET: - switch(arg) { - case 0: - STD::sprintf(s,"A symbol representing the joined list"); break; - } - break; - } -} /** \brief convert incoming list to a concatenated string diff --git a/externals/grill/delsplit/delsplit.cw b/externals/grill/delsplit/delsplit.cw Binary files differindex d77157a3..c0c7fef3 100755 --- a/externals/grill/delsplit/delsplit.cw +++ b/externals/grill/delsplit/delsplit.cw diff --git a/externals/grill/delsplit/main.cpp b/externals/grill/delsplit/main.cpp index a7369dc7..c2e6945f 100755 --- a/externals/grill/delsplit/main.cpp +++ b/externals/grill/delsplit/main.cpp @@ -51,7 +51,6 @@ protected: const t_symbol *delim; virtual void m_help(); - virtual void m_assist(long /*msg*/,long /*arg*/,char * /*s*/); static V SetAtom(t_atom &l,const C *s); private: @@ -73,9 +72,9 @@ V delsplit::Setup(t_class *c) delsplit::delsplit(I argc,const t_atom *argv): delim(NULL) { - AddInAnything(); - AddInSymbol(); - AddOutList(); + AddInAnything("Symbol in, representing the delimited list"); + AddInSymbol("Set the Delimiter"); + AddOutList("The split list"); if(argc && IsSymbol(argv[0])) delim = GetSymbol(argv[0]); } @@ -85,26 +84,6 @@ V delsplit::m_help() post("%s version " VERSION " (using flext " FLEXT_VERSTR "), (C) 2002 Thomas Grill",thisName()); } -V delsplit::m_assist(long msg,long arg,char *s) -{ - switch(msg) { - case 1: //ASSIST_INLET: - switch(arg) { - case 0: - STD::sprintf(s,"Symbol in, representing the delimited list"); break; - case 1: - STD::sprintf(s,"Set the Delimiter"); break; - } - break; - case 2: //ASSIST_OUTLET: - switch(arg) { - case 0: - STD::sprintf(s,"The split list"); break; - } - break; - } -} - /** \brief check whether string represents a number \ret 0..integer, 1..float, -1..no number */ diff --git a/externals/grill/idelay/delay.cpp b/externals/grill/idelay/delay.cpp index a922a8f8..0c3d97cf 100644 --- a/externals/grill/idelay/delay.cpp +++ b/externals/grill/idelay/delay.cpp @@ -49,8 +49,9 @@ idelay::idelay(F maxmsec) if (nsamps < 1) nsamps = 1; dline = new DelayLine<F>(nsamps); - AddInSignal(2); // audio in & delay signals - AddOutSignal(); // audio out + AddInSignal("Audio In"); // audio in + AddInSignal("Delay time (ms)"); // delay time + AddOutSignal("Audio Out"); // audio out } idelay::~idelay() diff --git a/externals/grill/idelay/idelay.cw b/externals/grill/idelay/idelay.cw Binary files differindex df339a0e..22c1f268 100644 --- a/externals/grill/idelay/idelay.cw +++ b/externals/grill/idelay/idelay.cw diff --git a/externals/grill/idelay/idelay.dsp b/externals/grill/idelay/idelay.dsp index ab94a4c5..abc428ab 100644 --- a/externals/grill/idelay/idelay.dsp +++ b/externals/grill/idelay/idelay.dsp @@ -40,7 +40,7 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0 # PROP Output_Dir "pd-msvc\r" # PROP Intermediate_Dir "pd-msvc\r" -# PROP Ignore_Export_Lib 0 +# PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DELAY_EXPORTS" /YX /FD /c # ADD CPP /nologo /W3 /GX /O2 /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /YX /FD /c @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"pd-msvc/r/idelay~.dll" /libpath:"c:/programme/audio/pd/bin" /libpath:"..\flext\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib /nologo /dll /machine:I386 /out:"pd-msvc/r/idelay~.dll" /libpath:"c:/programme/audio/pd/bin" /libpath:"..\flext\pd-msvc" !ELSEIF "$(CFG)" == "delay - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1 # PROP Output_Dir "pd-msvc\d" # PROP Intermediate_Dir "pd-msvc\d" -# PROP Ignore_Export_Lib 0 +# PROP Ignore_Export_Lib 1 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DELAY_EXPORTS" /YX /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /FR /YX /FD /GZ /c diff --git a/externals/grill/pool/pool.cw b/externals/grill/pool/pool.cw Binary files differindex 068876a4..5c72ed40 100755 --- a/externals/grill/pool/pool.cw +++ b/externals/grill/pool/pool.cw diff --git a/externals/grill/pool/pool.dsp b/externals/grill/pool/pool.dsp index 6614fc03..dd2209ae 100644 --- a/externals/grill/pool/pool.dsp +++ b/externals/grill/pool/pool.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /out:"pd-msvc/pool.dll" /libpath:"c:\programme\audio\pd\bin" /libpath:"f:\prog\max\flext\pd-msvc" +# ADD LINK32 kernel32.lib user32.lib pd.lib ../flext_sh/pd-msvc/t/flext.lib /nologo /dll /machine:I386 /out:"pd-msvc/pool.dll" /libpath:"c:\programme\audio\pd\bin" /libpath:"f:\prog\max\flext\pd-msvc" !ELSEIF "$(CFG)" == "pool - Win32 Debug" diff --git a/externals/grill/prepend/prepend.dsp b/externals/grill/prepend/prepend.dsp index ec6d1099..eee3de13 100644 --- a/externals/grill/prepend/prepend.dsp +++ b/externals/grill/prepend/prepend.dsp @@ -38,8 +38,8 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "msvc" -# PROP Intermediate_Dir "msvc" +# PROP Output_Dir "pd-msvc/r" +# PROP Intermediate_Dir "pd-msvc/r" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PREPEND_EXPORTS" /YX /FD /c @@ -64,8 +64,8 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "msvc-debug" -# PROP Intermediate_Dir "msvc-debug" +# PROP Output_Dir "pd-msvc/d" +# PROP Intermediate_Dir "pd-msvc/d" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PREPEND_EXPORTS" /YX /FD /GZ /c diff --git a/externals/grill/vasp/vasp.cw b/externals/grill/vasp/vasp.cw Binary files differindex f7023f97..8e698cb2 100644 --- a/externals/grill/vasp/vasp.cw +++ b/externals/grill/vasp/vasp.cw diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp index e756f28a..306c660b 100644 --- a/externals/grill/xsample/source/groove.cpp +++ b/externals/grill/xsample/source/groove.cpp @@ -10,6 +10,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "main.h" #include <math.h> +#include <stdio.h> #ifdef _MSC_VER #pragma warning (disable:4244) @@ -30,10 +31,6 @@ public: virtual BL Init(); -#if FLEXT_SYS == FLEXT_SYS_MAX - virtual V m_assist(L msg,L arg,C *s); -#endif - virtual V m_help(); virtual V m_print(); @@ -177,12 +174,18 @@ xgroove::xgroove(I argc,const t_atom *argv): else buf = new buffer(NULL,true); - AddInSignal(); // speed signal - AddInFloat(2); // min & max play pos - AddOutSignal(outchns); // output - AddOutSignal(); // position - AddOutFloat(2); // play min & max - AddOutBang(); // loop bang + AddInSignal("Signal of playing speed"); // speed signal + AddInFloat("Starting point"); // min play pos + AddInFloat("Ending point"); // max play pos + for(I ci = 0; ci < outchns; ++ci) { + C tmp[30]; + sprintf(tmp,"Audio signal channel %i",ci+1); + AddOutSignal(tmp); // output + } + AddOutSignal("Position currently played"); // position + AddOutFloat("Starting point (rounded to frame)"); // play min + AddOutFloat("Ending point (rounded to frame)"); // play max + AddOutBang("Bang on loop end/rollover"); // loop bang znbuf = new S *[outchns]; @@ -674,40 +677,3 @@ V xgroove::m_print() post(""); } -#if FLEXT_SYS == FLEXT_SYS_MAX -V xgroove::m_assist(long msg, long arg, char *s) -{ - switch(msg) { - case 1: //ASSIST_INLET: - switch(arg) { - case 0: - sprintf(s,"Signal of playing speed"); break; - case 1: - sprintf(s,"Starting point"); break; - case 2: - sprintf(s,"Ending point"); break; - } - break; - case 2: //ASSIST_OUTLET: - if(arg < outchns) - sprintf(s,"Audio signal channel %li",arg+1); - else - switch(arg-outchns) { - case 0: - sprintf(s,"Position currently played"); break; - case 1: - sprintf(s,"Starting point (rounded to frame)"); break; - case 2: - sprintf(s,"Ending point (rounded to frame)"); break; - case 3: - sprintf(s,"Bang on loop end/rollover"); break; - } - break; - } -} -#endif - - - - - diff --git a/externals/grill/xsample/source/play.cpp b/externals/grill/xsample/source/play.cpp index c2e6ef41..770dd6b6 100644 --- a/externals/grill/xsample/source/play.cpp +++ b/externals/grill/xsample/source/play.cpp @@ -9,6 +9,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. */ #include "main.h" +#include <stdio.h> #ifdef _MSC_VER #pragma warning (disable:4244) @@ -25,10 +26,6 @@ public: virtual BL Init(); -#if FLEXT_SYS == FLEXT_SYS_MAX - virtual V m_assist(L msg,L arg,C *s); -#endif - virtual V m_help(); virtual V m_print(); @@ -69,8 +66,12 @@ xplay::xplay(I argc,const t_atom *argv) else buf = new buffer(NULL,true); - AddInSignal(); // pos signal - AddOutSignal(outchns); + AddInSignal("Messages and Signal of playing position"); // pos signal + for(I ci = 0; ci < outchns; ++ci) { + C tmp[30]; + sprintf(tmp,"Audio signal channel %i",ci+1); + AddOutSignal(tmp); + } m_reset(); } @@ -126,24 +127,3 @@ V xplay::m_print() } -#if FLEXT_SYS == FLEXT_SYS_MAX -V xplay::m_assist(L msg,L arg,C *s) -{ - switch(msg) { - case 1: //ASSIST_INLET: - switch(arg) { - case 0: - sprintf(s,"Messages and Signal of playing position"); break; - } - break; - case 2: //ASSIST_OUTLET: - if(arg < outchns) - sprintf(s,"Audio signal channel %li",arg+1); - break; - } -} -#endif - - - - diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp index 318e01d2..36d6549a 100644 --- a/externals/grill/xsample/source/record.cpp +++ b/externals/grill/xsample/source/record.cpp @@ -9,6 +9,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. */ #include "main.h" +#include <stdio.h> #ifdef _MSC_VER #pragma warning (disable:4244) @@ -25,10 +26,6 @@ public: virtual BL Init(); -#if FLEXT_SYS == FLEXT_SYS_MAX - virtual V m_assist(L msg,L arg,C *s); -#endif - virtual V m_help(); virtual V m_print(); @@ -143,12 +140,18 @@ xrecord::xrecord(I argc,const t_atom *argv): else buf = new buffer(NULL,true); - AddInSignal(inchns); // audio signals - AddInSignal(); // on/off signal - AddInFloat(2); // min & max - AddOutSignal(); // pos signal - AddOutFloat(2); // min & max - AddOutBang(); // loop bang + for(I ci = 0; ci < inchns; ++ci) { + C tmp[30]; + sprintf(tmp,"Audio channel %i",ci+1); + AddInSignal(tmp); // audio signals + } + AddInSignal("On/Off/Fade/Mix signal (0..1)"); // on/off signal + AddInFloat("Starting point of recording"); // min + AddInFloat("Ending point of recording"); // max + AddOutSignal("Current position of recording"); // pos signal + AddOutFloat("Starting point (rounded to frame)"); // min + AddOutFloat("Ending point (rounded to frame)"); // max + AddOutBang("Bang on loop end/rollover"); // loop bang FLEXT_ADDMETHOD(inchns+1,m_min); FLEXT_ADDMETHOD(inchns+2,m_max); @@ -460,43 +463,3 @@ V xrecord::m_print() post(""); } - -#if FLEXT_SYS == FLEXT_SYS_MAX -V xrecord::m_assist(L msg,L arg,C *s) -{ - switch(msg) { - case 1: //ASSIST_INLET: - if(arg < inchns) { - if(arg) - sprintf(s,"Messages and Audio channel 1"); - else - sprintf(s,"Audio channel %li",arg+1); - } - else - switch(arg-inchns) { - case 0: - sprintf(s,"On/Off/Fade/Mix signal (0..1)"); break; - case 1: - sprintf(s,"Starting point of recording"); break; - case 2: - sprintf(s,"Ending point of recording"); break; - } - break; - case 2: //ASSIST_OUTLET: - switch(arg) { - case 0: - sprintf(s,"Current position of recording"); break; - case 1: - sprintf(s,"Starting point (rounded to frame)"); break; - case 2: - sprintf(s,"Ending point (rounded to frame)"); break; - case 3: - sprintf(s,"Bang on loop end/rollover"); break; - } - break; - } -} -#endif - - - |