Pd-cvs March 2005

pd-cvs@lists.iem.at

10 participants
138 discussions

externals/iem/iemmatrix/src mtx_print.c,1.1.1.1,1.2
by IOhannes m zmölnig 30 Mar '05

30 Mar '05

Update of /cvsroot/pure-data/externals/iem/iemmatrix/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5253 Modified Files: mtx_print.c Log Message: added labels when printing Index: mtx_print.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_print.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mtx_print.c 21 Mar 2005 14:33:31 -0000 1.1.1.1 --- mtx_print.c 30 Mar 2005 12:06:29 -0000 1.2 *************** *** 14,23 **** #include "iemmatrix.h" - #include "iemmatrix.h" /* mtx_print */ static t_class *mtx_print_class; ! static void mtx_print(t_matrix *x, t_symbol *s, int argc, t_atom *argv) { int col, row; --- 14,27 ---- #include "iemmatrix.h" + typedef struct _mtxprint + { + t_object x_obj; + t_symbol *x_s; + } t_mtxprint; /* mtx_print */ static t_class *mtx_print_class; ! static void mtx_print(t_mtxprint *x, t_symbol *s, int argc, t_atom *argv) { int col, row; *************** *** 32,36 **** return; } ! post("matrix:"); while(row--){ postatom(col, argv); --- 36,40 ---- return; } ! post("%s:", x->x_s->s_name); while(row--){ postatom(col, argv); *************** *** 40,48 **** endpost(); } ! static void *mtx_print_new(void) { ! t_matrix *x = (t_matrix *)pd_new(mtx_print_class); ! x->row = x->col = 0; ! x->atombuffer = 0; return (x); } --- 44,51 ---- endpost(); } ! static void *mtx_print_new(t_symbol*s) { ! t_mtxprint *x = (t_mtxprint *)pd_new(mtx_print_class); ! x->x_s=(s&&s!=&s_)?s:gensym("matrix"); return (x); } *************** *** 50,54 **** { mtx_print_class = class_new(gensym("mtx_print"), (t_newmethod)mtx_print_new, ! 0, sizeof(t_matrix), 0, 0, 0); class_addmethod (mtx_print_class, (t_method)mtx_print, gensym("matrix"), A_GIMME, 0); class_sethelpsymbol(mtx_print_class, gensym("iemmatrix/matrix")); --- 53,57 ---- { mtx_print_class = class_new(gensym("mtx_print"), (t_newmethod)mtx_print_new, ! 0, sizeof(t_mtxprint), 0, A_DEFSYM, 0); class_addmethod (mtx_print_class, (t_method)mtx_print, gensym("matrix"), A_GIMME, 0); class_sethelpsymbol(mtx_print_class, gensym("iemmatrix/matrix"));

1 0

externals/grill/vst vst.vcproj,1.18,1.19
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/vst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7901 Modified Files: vst.vcproj Log Message: small OSX things experimenting a bit.... clean handling of plugin deletion (potentially open editor window etc.) Index: vst.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/vst.vcproj,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** vst.vcproj 16 Mar 2005 04:59:33 -0000 1.18 --- vst.vcproj 25 Mar 2005 04:55:10 -0000 1.19 *************** *** 87,92 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";..\flext\source;c:\data\prog\audio\vstsdk2.3\source\common" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0501;WINVER=0x0501;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;xFLEXT_LOGGING" BasicRuntimeChecks="3" RuntimeLibrary="1" --- 87,92 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\pd\pd-cvs\src";..\flext\source;c:\data\prog\audio\vstsdk2.3\source\common" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0501;WINVER=0x0501;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_LOGGING" BasicRuntimeChecks="3" RuntimeLibrary="1"

1 0

externals/grill/vst/src editorwin.hpp,1.3,1.4 main.cpp,1.27,1.28 vsthost.cpp,1.8,1.9 vsthost.h,1.8,1.9 vstmaster.cpp,1.4,1.5
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/vst/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7901/src Modified Files: editorwin.hpp main.cpp vsthost.cpp vsthost.h vstmaster.cpp Log Message: small OSX things experimenting a bit.... clean handling of plugin deletion (potentially open editor window etc.) Index: vstmaster.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/vstmaster.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** vstmaster.cpp 16 Mar 2005 04:59:35 -0000 1.4 --- vstmaster.cpp 25 Mar 2005 04:55:11 -0000 1.5 *************** *** 71,77 **** long VSTPlugin::Master(AEffect *effect, long opcode, long index, long value, void *ptr, float opt) { ! #ifdef FLEXT_LOGGING ! post("VST -> host: Eff = 0x%.8X, Opcode = %d, Index = %d, Value = %d, PTR = %.8X, OPT = %.3f\n",(int)effect, opcode,index,value,(int)ptr,opt); ! #endif VSTPlugin *th = effect?(VSTPlugin *)effect->user:NULL; --- 71,76 ---- long VSTPlugin::Master(AEffect *effect, long opcode, long index, long value, void *ptr, float opt) { ! if(opcode != audioMasterGetTime) ! FLEXT_LOG6("VST -> host: Eff = 0x%.8X, Opcode = %d, Index = %d, Value = %d, PTR = %.8X, OPT = %.3f\n",(int)effect, opcode,index,value,(int)ptr,opt); VSTPlugin *th = effect?(VSTPlugin *)effect->user:NULL; *************** *** 102,114 **** //! \todo set connection state correctly (if possible..) // index=pin, value=0..input, else..output ! #ifdef FLEXT_LOGGING ! post("Pin connected pin=%li conn=%li",index,value); ! #endif return 0; // 0 means connected case audioMasterWantMidi: // 6 ! #ifdef FLEXT_LOGGING ! post("Want MIDI = %li",value); ! #endif return 0; // VST header says: "currently ignored" --- 101,109 ---- //! \todo set connection state correctly (if possible..) // index=pin, value=0..input, else..output ! FLEXT_LOG2("Pin connected pin=%li conn=%li",index,value); return 0; // 0 means connected case audioMasterWantMidi: // 6 ! FLEXT_LOG1("Want MIDI = %li",value); return 0; // VST header says: "currently ignored" *************** *** 167,173 **** case audioMasterSetTime: { // 9 VstTimeInfo *tminfo = static_cast<VstTimeInfo *>(ptr); ! #ifdef FLEXT_DEBUG ! post("TimeInfo pos=%lf rate=%lf filter=%li",tminfo->samplePos,tminfo->sampleRate,value); ! #endif return 0; // not supported } --- 162,166 ---- case audioMasterSetTime: { // 9 VstTimeInfo *tminfo = static_cast<VstTimeInfo *>(ptr); ! FLEXT_LOG3("TimeInfo pos=%lf rate=%lf filter=%li",tminfo->samplePos,tminfo->sampleRate,value); return 0; // not supported } *************** *** 207,213 **** case audioMasterCanDo: // 37 ! #ifdef FLEXT_LOGGING ! post("\taudioMasterCanDo PTR = %s",ptr); ! #endif if(!strcmp((char *)ptr,"sendVstEvents")) return 1; --- 200,204 ---- case audioMasterCanDo: // 37 ! FLEXT_LOG1("\taudioMasterCanDo PTR = %s",ptr); if(!strcmp((char *)ptr,"sendVstEvents")) return 1; *************** *** 260,272 **** case audioMasterUpdateDisplay: // 42 ! #ifdef FLEXT_LOGGING ! post("UPDATE DISPLAY"); ! #endif return 0; default: ! #ifdef FLEXT_DEBUG ! post("Unknown opcode %li",opcode); ! #endif return 0; } --- 251,259 ---- case audioMasterUpdateDisplay: // 42 ! FLEXT_LOG("UPDATE DISPLAY"); return 0; default: ! FLEXT_LOG1("Unknown opcode %li",opcode); return 0; } Index: vsthost.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/vsthost.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** vsthost.h 20 Mar 2005 04:57:22 -0000 1.8 --- vsthost.h 25 Mar 2005 04:55:11 -0000 1.9 *************** *** 217,221 **** void AddPitchBend(int value) { ! AddMIDI(MIDI_PITCHBEND+midichannel,((value>>7)&127),(value&127)); } --- 217,221 ---- void AddPitchBend(int value) { ! AddMIDI(MIDI_PITCHBEND+midichannel,(value&127),((value>>7)&127)); } *************** *** 292,310 **** public: ! void processReplacing(float **inputs,float **outputs,long sampleframes ) { FLEXT_ASSERT(effect); ! effect->processReplacing(effect,inputs,outputs,sampleframes); if(playing) updatepos(sampleframes); } ! void process(float **inputs,float **outputs,long sampleframes ) { FLEXT_ASSERT(effect); ! effect->process(effect,inputs,outputs,sampleframes); ! if(playing) updatepos(sampleframes); } private: void updatepos(long frames); --- 292,312 ---- public: ! bool processReplacing(float **inputs,float **outputs,long sampleframes ) { FLEXT_ASSERT(effect); ! effect->processReplacing(effect,inputs,outputs,sampleframes); if(playing) updatepos(sampleframes); + return true; } ! bool process(float **inputs,float **outputs,long sampleframes ) { FLEXT_ASSERT(effect); ! effect->process(effect,inputs,outputs,sampleframes); ! return true; } private: + void updatepos(long frames); Index: vsthost.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/vsthost.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** vsthost.cpp 20 Mar 2005 04:57:22 -0000 1.8 --- vsthost.cpp 25 Mar 2005 04:55:11 -0000 1.9 *************** *** 170,175 **** #if FLEXT_OS == FLEXT_OS_WIN ! FLEXT_ASSERT(!hdll); ! hdll = LoadLibrary(dllname.c_str()); if(hdll) pluginmain = (PVSTMAIN)GetProcAddress(hdll,"main"); audiomaster = Master; --- 170,174 ---- #if FLEXT_OS == FLEXT_OS_WIN ! hdll = LoadLibraryEx(dllname.c_str(),NULL,0 /*DONT_RESOLVE_DLL_REFERENCES*/); if(hdll) pluginmain = (PVSTMAIN)GetProcAddress(hdll,"main"); audiomaster = Master; Index: editorwin.hpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/editorwin.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** editorwin.hpp 16 Mar 2005 04:59:35 -0000 1.3 --- editorwin.hpp 25 Mar 2005 04:55:11 -0000 1.4 *************** *** 57,61 **** case WM_TIMER: // fall through case WM_ENTERIDLE: ! plug->EditorIdle(); break; #if 0 --- 57,61 ---- case WM_TIMER: // fall through case WM_ENTERIDLE: ! // plug->EditorIdle(); break; #if 0 *************** *** 226,230 **** --- 226,233 ---- else { TranslateMessage(&msg); + // double tm1 = flext::GetOSTime(); DispatchMessage(&msg); + // double tm2 = flext::GetOSTime(); + // if(tm2-tm1 > 0.01) FLEXT_LOG1("halt %lf",(tm2-tm1)*1000); } } Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vst/src/main.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** main.cpp 20 Mar 2005 04:57:22 -0000 1.27 --- main.cpp 25 Mar 2005 04:55:11 -0000 1.28 *************** *** 13,18 **** #include "main.h" ! #include "Editor.h" ! #include "VstHost.h" #include <stdlib.h> --- 13,18 ---- #include "main.h" ! #include "editor.h" ! #include "vsthost.h" #include <stdlib.h> *************** *** 27,31 **** ! #define VST_VERSION "0.1.0pre24" --- 27,31 ---- ! #define VST_VERSION "0.1.0pre26" *************** *** 158,162 **** int blsz; ! void (VSTPlugin::*vstfun)(t_sample **insigs,t_sample **outsigs,long n); bool sigmatch; t_sample **vstin,**vstout,**tmpin,**tmpout; --- 158,162 ---- int blsz; ! bool (VSTPlugin::*vstfun)(t_sample **insigs,t_sample **outsigs,long n); bool sigmatch; t_sample **vstin,**vstout,**tmpin,**tmpout; *************** *** 652,657 **** ZeroSamples(outsigs[i],n); } ! else if(sigmatch) ! (plug->*vstfun)(const_cast<t_sample **>(InSig()),const_cast<t_sample **>(OutSig()),Blocksize()); else { const int inputs = plug->GetNumInputs(),outputs = plug->GetNumOutputs(); --- 652,661 ---- ZeroSamples(outsigs[i],n); } ! else if(sigmatch) { ! if(!(plug->*vstfun)(const_cast<t_sample **>(InSig()),const_cast<t_sample **>(OutSig()),Blocksize())) { ! for(int i = 0; i < CntOutSig(); ++i) ! ZeroSamples(OutSig()[i],Blocksize()); ! } ! } else { const int inputs = plug->GetNumInputs(),outputs = plug->GetNumOutputs(); *************** *** 687,691 **** // call plugin DSP function ! (plug->*vstfun)(inv,outv,n); if(more) { --- 691,698 ---- // call plugin DSP function ! if(!(plug->*vstfun)(inv,outv,n)) { ! for(int i = 0; i < outputs; ++i) ! ZeroSamples(outsigs[i],n); ! } if(more) {

1 0

externals/grill/py/source pybuffer.cpp,1.4,1.5 pydsp.cpp,1.2,1.3
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7326/source Modified Files: pybuffer.cpp pydsp.cpp Log Message: fixes for maxmsp added generic numpy support (not working) Index: pydsp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pydsp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pydsp.cpp 14 Mar 2005 04:58:13 -0000 1.2 --- pydsp.cpp 25 Mar 2005 04:54:17 -0000 1.3 *************** *** 64,68 **** } ! PyObject *NAFromBuffer(PyObject *buf,int c,int n); void pydsp::NewBuffers() --- 64,68 ---- } ! PyObject *arrayfrombuffer(PyObject *buf,int c,int n); void pydsp::NewBuffers() *************** *** 83,87 **** Py_XDECREF(buffers[i]); PyObject *b = PyBuffer_FromReadWriteMemory(insigs[i],n*sizeof(t_sample)); ! buffers[i] = NAFromBuffer(b,1,n); Py_DECREF(b); } --- 83,87 ---- Py_XDECREF(buffers[i]); PyObject *b = PyBuffer_FromReadWriteMemory(insigs[i],n*sizeof(t_sample)); ! buffers[i] = arrayfrombuffer(b,1,n); Py_DECREF(b); } *************** *** 95,99 **** else { PyObject *b = PyBuffer_FromReadWriteMemory(outsigs[i],n*sizeof(t_sample)); ! buffers[ins+i] = NAFromBuffer(b,1,n); Py_DECREF(b); } --- 95,99 ---- else { PyObject *b = PyBuffer_FromReadWriteMemory(outsigs[i],n*sizeof(t_sample)); ! buffers[ins+i] = arrayfrombuffer(b,1,n); Py_DECREF(b); } Index: pybuffer.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybuffer.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pybuffer.cpp 14 Mar 2005 04:58:13 -0000 1.4 --- pybuffer.cpp 25 Mar 2005 04:54:16 -0000 1.5 *************** *** 11,24 **** #include "main.h" ! #ifdef PY_NUMARRAY ! #if FLEXT_OS == FLEXT_OS_MAC ! #include <Python/numarray/numarray.h> #else ! #include <numarray/numarray.h> #endif - static bool nasupport = false; - static NumarrayType numtype; #endif // PD defines a T_OBJECT symbol #undef T_OBJECT --- 11,58 ---- #include "main.h" ! #undef PY_ARRAYS ! ! ! #if defined(PY_NUMERIC) ! #define PY_ARRAYS 1 ! ! #if FLEXT_OS == FLEXT_OS_MAC ! #include <Python/Numeric/arrayobject.h> ! #else ! #include <Numeric/arrayobject.h> ! #endif ! #elif defined(PY_NUMARRAY) ! #define PY_ARRAYS 1 ! #define NA ! ! #ifdef NA ! #if FLEXT_OS == FLEXT_OS_MAC ! #include <Python/numarray/numarray.h> ! #else ! #include <numarray/numarray.h> ! #endif #else ! #if FLEXT_OS == FLEXT_OS_MAC ! #include <Python/numarray/arrayobject.h> ! #else ! #include <numarray/arrayobject.h> ! #endif #endif #endif + + #ifdef PY_ARRAYS + + #ifdef NA + static NumarrayType numtype = tAny; + inline bool arrsupport() { return numtype != tAny; } + #else + static PyArray_TYPES numtype = PyArray_NOTYPE; + inline bool arrsupport() { return numtype != PyArray_NOTYPE; } + #endif + + #endif + + // PD defines a T_OBJECT symbol #undef T_OBJECT *************** *** 189,201 **** } ! PyObject *NAFromBuffer(PyObject *buf,int c,int n) { ! #ifdef PY_NUMARRAY ! if(nasupport) { ! maybelong shape[2]; shape[0] = n; shape[1] = c; ! PyArrayObject *na = NA_NewAllFromBuffer(c == 1?1:2,shape,numtype,buf,0,0,NA_ByteOrder(),1,1); ! return (PyObject *)na; } else --- 223,251 ---- } ! PyObject *arrayfrombuffer(PyObject *buf,int c,int n) { ! #ifdef PY_ARRAYS ! if(arrsupport()) { ! PyObject *arr; ! int shape[2]; shape[0] = n; shape[1] = c; ! #ifdef NA ! arr = (PyObject *)NA_NewAllFromBuffer(c == 1?1:2,shape,numtype,buf,0,0,NA_ByteOrder(),1,1); ! #else ! void *data; ! int len; ! int err = PyObject_AsWriteBuffer(buf,&data,&len); ! if(!err) { ! FLEXT_ASSERT(len <= n*c*sizeof(t_sample)); ! Py_INCREF(buf); ! arr = PyArray_FromDimsAndData(c == 1?1:2,shape,numtype,(char *)data); ! } ! else { ! // exception string is already set ! arr = NULL; ! } ! #endif ! return arr; } else *************** *** 207,212 **** { PyObject *ret; ! #ifdef PY_NUMARRAY ! if(nasupport) { if(self->buf) { const int n = self->buf->Frames(); --- 257,262 ---- { PyObject *ret; ! #ifdef PY_ARRAYS ! if(arrsupport()) { if(self->buf) { const int n = self->buf->Frames(); *************** *** 217,221 **** if(ihigh > n) ihigh = n; ! PyObject *nobj = NAFromBuffer((PyObject *)self,c,n); if(ilow != 0 || ihigh != n) { ret = PySequence_GetSlice(nobj,ilow,ihigh); --- 267,271 ---- if(ihigh > n) ihigh = n; ! PyObject *nobj = arrayfrombuffer((PyObject *)self,c,n); if(ilow != 0 || ihigh != n) { ret = PySequence_GetSlice(nobj,ilow,ihigh); *************** *** 272,277 **** { int ret; ! #ifdef PY_NUMARRAY ! if(nasupport) { if(!value) { PyErr_SetString(PyExc_TypeError,"Object doesn't support item deletion"); --- 322,327 ---- { int ret; ! #ifdef PY_ARRAYS ! if(arrsupport()) { if(!value) { PyErr_SetString(PyExc_TypeError,"Object doesn't support item deletion"); *************** *** 286,290 **** --- 336,344 ---- if(ihigh > n) ihigh = n; + #ifdef NA PyArrayObject *out = NA_InputArray(value,numtype,NUM_C_ARRAY); + #else + PyArrayObject *out = (PyArrayObject *)PyArray_ContiguousFromObject(value,numtype,0,0); + #endif if(!out) { PyErr_SetString(PyExc_TypeError,"Assigned object must be a numarray"); *************** *** 298,302 **** --- 352,360 ---- int dlen = ihigh-ilow; int slen = out->dimensions[0]; + #ifdef NA flext::CopySamples(self->buf->Data()+ilow,(t_sample *)NA_OFFSETDATA(out),slen < dlen?slen:dlen); + #else + flext::CopySamples(self->buf->Data()+ilow,(t_sample *)out->data,slen < dlen?slen:dlen); + #endif self->dirty = true; ret = 0; *************** *** 675,681 **** void initsamplebuffer() { - #ifdef PY_NUMARRAY PyErr_Clear(); import_libnumarray(); if(PyErr_Occurred()) // catch import error --- 733,744 ---- void initsamplebuffer() { PyErr_Clear(); + + #ifdef PY_ARRAYS + #ifdef NA import_libnumarray(); + #else + import_array(); + #endif if(PyErr_Occurred()) // catch import error *************** *** 683,692 **** else { // numarray support ok ! nasupport = true; post(""); ! post("Numarray support enabled"); } - - numtype = sizeof(t_sample) == 4?tFloat32:tFloat64; #endif --- 746,757 ---- else { // numarray support ok ! #ifdef NA ! numtype = sizeof(t_sample) == 4?tFloat32:tFloat64; ! #else ! numtype = sizeof(t_sample) == 4?PyArray_FLOAT:PyArray_DOUBLE; ! #endif post(""); ! post("Python array support enabled"); } #endif *************** *** 696,698 **** Py_INCREF(&pySamplebuffer_Type); } - --- 761,762 ----

1 0

externals/grill/py py.vcproj,1.21,1.22 readme.txt,1.34,1.35
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7326 Modified Files: py.vcproj readme.txt Log Message: fixes for maxmsp added generic numpy support (not working) Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** py.vcproj 13 Mar 2005 04:59:35 -0000 1.21 --- py.vcproj 25 Mar 2005 04:54:16 -0000 1.22 *************** *** 86,90 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";..\flext\source;c:\programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS;PY_NUMARRAY" BasicRuntimeChecks="3" --- 86,90 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\pd\pd-cvs\src";..\flext\source;c:\programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS;PY_NUMARRAY" BasicRuntimeChecks="3" *************** *** 507,513 **** HeaderFileName=""/> <Tool ! Name="VCPostBuildEventTool" ! Description="copy" ! CommandLine="copy $(outdir)\py.mxe "C:\Programme\Gemeinsame Dateien\Cycling '74\externals""/> <Tool Name="VCPreBuildEventTool"/> --- 507,511 ---- HeaderFileName=""/> <Tool ! Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> *************** *** 531,536 **** <Configuration Name="Max Threaded Release|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" UseOfMFC="0" --- 529,534 ---- <Configuration Name="Max Threaded Release|Win32" ! OutputDirectory=".\max-msvc\tr" ! IntermediateDirectory=".\max-msvc\tr" ConfigurationType="2" UseOfMFC="0" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** readme.txt 13 Mar 2005 04:59:35 -0000 1.34 --- readme.txt 25 Mar 2005 04:54:16 -0000 1.35 *************** *** 35,38 **** --- 35,53 ---- (you would have to substitute ../flext with the respective path to the flext package) + + ---------------------------------------------------------------------------- + + Python array support for py/pyext@Max/MSP: + + In the Max/MSP SDK change the file + 4.5 headers\c74support\max-includes\ext_types.h, line 45 + from + typedef unsigned long UInt32; + typedef signed long SInt32; + to + typedef unsigned int UInt32; + typedef signed int SInt32; + to avoid a compile-time type definition clash. + ----------------------------------------------------------------------------

1 0

externals/grill/py/maxmsp py-objectmappings.txt,1.2,1.3
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/py/maxmsp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7326/maxmsp Modified Files: py-objectmappings.txt Log Message: fixes for maxmsp added generic numpy support (not working) Index: py-objectmappings.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/maxmsp/py-objectmappings.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** py-objectmappings.txt 10 Jan 2005 05:00:55 -0000 1.2 --- py-objectmappings.txt 25 Mar 2005 04:54:16 -0000 1.3 *************** *** 5,8 **** --- 5,12 ---- max objectfile pyx py; max objectfile pyx. py; + max objectfile pyext~ py; + max objectfile pyext.~ py; + max objectfile pyx~ py; + max objectfile pyx.~ py; max oblist python py; *************** *** 10,11 **** --- 14,17 ---- max oblist python pyext; max oblist python pyext.; + max oblist python pyext~; + max oblist python pyext.~;

1 0

externals/grill/py/scripts buffer.py,1.2,1.3 sig.py,1.2,1.3
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/py/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7326/scripts Modified Files: buffer.py sig.py Log Message: fixes for maxmsp added generic numpy support (not working) Index: buffer.py =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/scripts/buffer.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** buffer.py 10 Mar 2005 04:59:00 -0000 1.2 --- buffer.py 25 Mar 2005 04:54:16 -0000 1.3 *************** *** 8,14 **** """This is an example script for the py/pyext object's buffer support. ! PD/Max buffers can be mapped to numarray arrays. ! For numarray see http://numeric.scipy.org ! It will probably once be replaced by Numeric(3) """ --- 8,14 ---- """This is an example script for the py/pyext object's buffer support. ! PD/Max buffers can be mapped to Python arrays. ! Currently, there are three implementations: ! Numeric, numarray and Numeric3 (for all of them see http://numeric.scipy.org) """ *************** *** 20,24 **** print "ERROR: This script must be loaded by the PD/Max py/pyext external" ! try: from numarray import * except: --- 20,24 ---- print "ERROR: This script must be loaded by the PD/Max py/pyext external" ! try: from numarray import * except: *************** *** 32,36 **** b = pyext.Buffer(args[2]) ! # slicing causes numarrays (mapped to buffers) to be created # note the c[:] - to assign contents you must assign to a slice of the buffer c[:] = a[:]*b[:] --- 32,36 ---- b = pyext.Buffer(args[2]) ! # slicing causes Python arrays (mapped to buffers) to be created # note the c[:] - to assign contents you must assign to a slice of the buffer c[:] = a[:]*b[:] *************** *** 42,47 **** # this is also possible, but is probably slower ! # the + converts a into a numarray, the argument b is taken as a sequence ! # depending on the implementation in numarray this may be as fast # as above or not c[:] = a+b --- 42,47 ---- # this is also possible, but is probably slower ! # the + converts a into a Python array, the argument b is taken as a sequence ! # depending on the implementation this may be as fast # as above or not c[:] = a+b *************** *** 54,58 **** def neg(target): a = pyext.Buffer(target) ! # in place transformation (see numarray ufuncs) negative(a[:],a[:]) # must mark buffer content as dirty to update graph --- 54,58 ---- def neg(target): a = pyext.Buffer(target) ! # in place transformation (see Python array ufuncs) negative(a[:],a[:]) # must mark buffer content as dirty to update graph Index: sig.py =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/scripts/sig.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sig.py 14 Mar 2005 04:58:12 -0000 1.2 --- sig.py 25 Mar 2005 04:54:16 -0000 1.3 *************** *** 49,54 **** def _dsp(self): ! # cache vectors ! self.invec =self._invec(0) self.outvec = self._outvec(0) # initialize _signal method here for optimized version --- 49,54 ---- def _dsp(self): ! # cache vectors in this scope ! self.invec = self._invec(0) self.outvec = self._outvec(0) # initialize _signal method here for optimized version

1 0

externals/grill/pool/source main.cpp,1.8,1.9 pool.cpp,1.13,1.14
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6962/source Modified Files: main.cpp pool.cpp Log Message: update for flext build system added saving/loading of spaces and other special characters (escaping) Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.cpp 4 Jan 2005 05:00:38 -0000 1.8 --- main.cpp 25 Mar 2005 04:53:43 -0000 1.9 *************** *** 233,237 **** { post(""); ! post("pool %s - hierarchical storage object, (C)2002-2004 Thomas Grill",POOL_VERSION); post(""); --- 233,237 ---- { post(""); ! post("pool %s - hierarchical storage object, (C)2002-2005 Thomas Grill",POOL_VERSION); post(""); Index: pool.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pool.cpp 4 Jan 2005 05:00:39 -0000 1.13 --- pool.cpp 25 Mar 2005 04:53:43 -0000 1.14 *************** *** 468,489 **** ! static C *ReadAtom(C *c,A *a) { ! // skip whitespace while(*c && isspace(*c)) ++c; if(!*c) return NULL; ! const C *m = c; // remember position ! // go to next whitespace ! // \todo recognize symbol escapes ! for(; *c && !isspace(*c); ++c) {} // save character and set delimiter - char t = *c; *c = 0; float fres; // first try float ! if(sscanf(m,"%f",&fres) == 1) { if(a) { int ires = (int)fres; // try a cast --- 468,504 ---- ! static char *ReadAtom(char *c,A *a) { ! // skip leading whitespace while(*c && isspace(*c)) ++c; if(!*c) return NULL; ! char tmp[1024]; ! char *m = tmp; // write position ! // go to next whitespace ! for(bool escaped = false;; ++c) ! if(*c == '\\') { ! if(escaped) { ! *m++ = *c; ! escaped = false; ! } ! else ! escaped = true; ! } ! else if(!*c || (isspace(*c) && !escaped)) { ! *m = 0; ! break; ! } ! else { ! *m++ = *c; ! escaped = false; ! } // save character and set delimiter float fres; // first try float ! if(sscanf(tmp,"%f",&fres) == 1) { if(a) { int ires = (int)fres; // try a cast *************** *** 496,504 **** // no, it's a symbol else { ! if(a) flext::SetString(*a,m); } - // set back the saved character - *c = t; return c; } --- 511,517 ---- // no, it's a symbol else { ! if(a) flext::SetString(*a,tmp); } return c; } *************** *** 543,550 **** break; #endif ! case A_SYMBOL: ! os << flext::GetString(flext::GetSymbol(a)); break; } } --- 556,569 ---- break; #endif ! case A_SYMBOL: { ! const char *c = flext::GetString(flext::GetSymbol(a)); ! for(; *c; ++c) { ! if(isspace(*c) || *c == '\\' || *c == ',') ! os << '\\'; ! os << *c; ! } break; } + } } *************** *** 552,558 **** { for(I i = 0; i < l.Count(); ++i) { - // if(IsSymbol(l[i]) os << "\""; WriteAtom(os,l[i]); - // if(IsSymbol(l[i]) os << "\""; if(i < l.Count()-1) os << ' '; } --- 571,575 ----

1 0

externals/grill/pool pool.vcproj,1.17,1.18 readme.txt,1.23,1.24
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6962 Modified Files: pool.vcproj readme.txt Log Message: update for flext build system added saving/loading of spaces and other special characters (escaping) Index: pool.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.vcproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** pool.vcproj 17 Dec 2004 05:03:46 -0000 1.17 --- pool.vcproj 25 Mar 2005 04:53:42 -0000 1.18 *************** *** 22,26 **** Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="f:\prog\pd\pd-cvs\src,f:\prog\max\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" --- 22,26 ---- Optimization="2" InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\bin\src,..\flext\source" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" *************** *** 44,48 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="f:\prog\pd\pd-cvs\bin,f:\prog\max\flext\pd-msvc" ProgramDatabaseFile=".\pd-msvc/r/pool.pdb" ImportLibrary=".\pd-msvc/r/pool.lib" --- 44,48 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:\programme\audio\pd\bin" ProgramDatabaseFile=".\pd-msvc/r/pool.pdb" ImportLibrary=".\pd-msvc/r/pool.lib" *************** *** 88,92 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\max\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" --- 88,92 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\pd\pd-cvs\src";..\flext\source" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2" StringPooling="TRUE" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/readme.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** readme.txt 8 Feb 2005 04:57:38 -0000 1.23 --- readme.txt 25 Mar 2005 04:53:42 -0000 1.24 *************** *** 84,87 **** --- 84,88 ---- - fixed bad bug: pool::priv was not initialized - enhanced and optimized atom parsing + - escaped symbols (with \) for whitespace support on store and load 0.2.0: *************** *** 103,115 **** --------------------------------------------------------------------------- - BUGS: - - pool does not handle symbols with spaces, colons or all digits - - - TODO list: - - check for invalid symbols (spaces, colons) - general: - what is output as value if it is key only? (Max->nothing!) - XML format ok? - --- 104,108 ----

1 0

externals/grill/vasp license.txt,1.2,1.3 readme.txt,1.4,1.5
by Thomas Grill 25 Mar '05

25 Mar '05

Update of /cvsroot/pure-data/externals/grill/vasp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6666 Modified Files: license.txt readme.txt Log Message: update for flext build system avoid malicious file name characters preparing RIP release Index: license.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vasp/license.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** license.txt 7 Jan 2003 04:35:28 -0000 1.2 --- license.txt 25 Mar 2005 04:53:19 -0000 1.3 *************** *** 1,5 **** VASP modular - vector assembling signal processor Object library for Max/MSP and PD ! Copyright (C) 2002-2003 Thomas Grill This program is free software; you can redistribute it and/or --- 1,5 ---- VASP modular - vector assembling signal processor Object library for Max/MSP and PD ! Copyright (C) 2002-2005 Thomas Grill This program is free software; you can redistribute it and/or *************** *** 41,45 **** --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2003 Thomas Grill This program is free software; you can redistribute it and/or --- 41,45 ---- --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2005 Thomas Grill This program is free software; you can redistribute it and/or Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/vasp/readme.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme.txt 8 Feb 2005 04:57:16 -0000 1.4 --- readme.txt 25 Mar 2005 04:53:19 -0000 1.5 *************** *** 14,18 **** ========= ! http://grrrr.org/vasp ---------------------------------------------------------------------------- --- 14,18 ---- ========= ! http://grrrr.org/ext/vasp ----------------------------------------------------------------------------

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs March 2005