Pd-cvs March 2006

pd-cvs@lists.iem.at

16 participants
280 discussions

externals/grill/py/scripts sendrecv.py,1.6,1.7
by Thomas Grill 23 Mar '06

23 Mar '06

Update of /cvsroot/pure-data/externals/grill/py/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24934/scripts Modified Files: sendrecv.py Log Message: added message bundle functionality (pyext.Bundle class) enable compiled-only scripts (without .py) small optimizations and fixes some optimizations and py reload fix better error message for reload with invalid args enable module packages (module/__init__.py[co]), now also for Max Index: sendrecv.py =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/scripts/sendrecv.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sendrecv.py 19 Jan 2005 04:58:35 -0000 1.6 --- sendrecv.py 23 Mar 2006 01:42:04 -0000 1.7 *************** *** 136,140 **** # called scripting method should run on its own thread ! if self._isthreaded(): print "Threading is on" self._detach(1) --- 136,140 ---- # called scripting method should run on its own thread ! if self._isthreaded: print "Threading is on" self._detach(1) *************** *** 144,148 **** num = 12 # number of objects ! ori = complex(150,150) # origin rad = 100 # radius l = range(num) # initialize list --- 144,148 ---- num = 12 # number of objects ! ori = complex(150,180) # origin rad = 100 # radius l = range(num) # initialize list *************** *** 153,157 **** l[i] = ori+rad*exp(complex(0,i*2*pi/num)) self._tocanvas("obj",l[i].real,l[i].imag,"bng",15,250,50,0,"empty","yeah"+str(i),"empty",0,-6,64,8,0,-1,-1) ! self._tocanvas("connect",2,0,3+i,0) # blink --- 153,157 ---- l[i] = ori+rad*exp(complex(0,i*2*pi/num)) self._tocanvas("obj",l[i].real,l[i].imag,"bng",15,250,50,0,"empty","yeah"+str(i),"empty",0,-6,64,8,0,-1,-1) ! self._tocanvas("connect",6,0,7+i,0) # blink

1 0

externals/grill/py/source py.cpp, 1.34, 1.35 pybase.cpp, 1.13, 1.14 pybase.h, 1.10, 1.11 pyext.cpp, 1.45, 1.46
by Thomas Grill 23 Mar '06

23 Mar '06

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24934/source Modified Files: py.cpp pybase.cpp pybase.h pyext.cpp Log Message: added message bundle functionality (pyext.Bundle class) enable compiled-only scripts (without .py) small optimizations and fixes some optimizations and py reload fix better error message for reload with invalid args enable module packages (module/__init__.py[co]), now also for Max Index: pybase.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pybase.h 12 Dec 2005 00:18:42 -0000 1.10 --- pybase.h 23 Mar 2006 01:42:05 -0000 1.11 *************** *** 54,58 **** void AddCurrentPath(flext_base *o); - void GetModulePath(const char *mod,char *dir,int len); void SetArgs(); --- 54,57 ---- Index: pybase.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pybase.cpp 12 Dec 2005 00:18:42 -0000 1.13 --- pybase.cpp 23 Mar 2006 01:42:05 -0000 1.14 *************** *** 102,106 **** post("------------------------------------------------"); post("py/pyext %s - python script objects",PY__VERSION); ! post("(C)2002-2005 Thomas Grill - http://grrrr.org/ext"); post(""); post("using Python %s",Py_GetVersion()); --- 102,106 ---- post("------------------------------------------------"); post("py/pyext %s - python script objects",PY__VERSION); ! post("(C)2002-2006 Thomas Grill - http://grrrr.org/ext"); post(""); post("using Python %s",Py_GetVersion()); *************** *** 221,224 **** --- 221,225 ---- pybase::pybase() : module(NULL) + , dict(NULL) #ifdef FLEXT_THREADS , thrcount(0) *************** *** 388,392 **** char *editor = getenv("EDITOR"); ! if(!editor || !strcmp(editor, "/usr/bin/nano") || !strcmp(editor, "/usr/bin/pico") || !strcmp(editor, "/usr/bin/vi")) { // no environment variable or console text editor found ... use idle instead (should have come with Python) editor = "idle"; --- 389,393 ---- char *editor = getenv("EDITOR"); ! if(!editor) { // || !strcmp(editor, "/usr/bin/nano") || !strcmp(editor, "/usr/bin/pico") || !strcmp(editor, "/usr/bin/vi")) { // no environment variable or console text editor found ... use idle instead (should have come with Python) editor = "idle"; *************** *** 425,436 **** } bool pybase::ImportModule(const char *name) { if(name) { ! if(modname == name) return true; ! modname = name; } else modname.clear(); return ReloadModule(); } --- 426,546 ---- } + static bool getmodulesub(const char *mod,char *dir,int len,char *ext) + { + #if FLEXT_SYS == FLEXT_SYS_PD + char *name; + int fd = open_via_path("",mod,ext,dir,&name,len,0); + if(fd > 0) { + FLEXT_ASSERT(name && *name); + close(fd); + } + else { + // look for mod/__init__.py + std::string tmp(mod); + int l = tmp.size(); + tmp += "/__init__"; + fd = open_via_path("",tmp.c_str(),ext,dir,&name,len,0); + if(fd > 0) { + FLEXT_ASSERT(name && *name); + close(fd); + // we must remove the module name from dir + char *t = dir+strlen(dir)-l; + FLEXT_ASSERT(!strcmp(mod,t) && t[-1] == '/'); + t[-1] = 0; + } + else + name = NULL; + } + + // if dir is current working directory... name points to dir + if(dir == name) strcpy(dir,"."); + #elif FLEXT_SYS == FLEXT_SYS_MAX + short path; + long type; + char smod[1024]; + strcpy(smod,mod); + strcat(smod,ext); + bool ok = !locatefile_extended(smod,&path,&type,&type,0); + if(ok) + // convert pathname to unix style + path_topathname(path,NULL,smod); + else { + // do path/file.ext combinations work at all under Max? + strcpy(smod,mod); + + short path; + type = 'fold'; + ok = !locatefile_extended(smod,&path,&type,&type,1); + if(ok) { + // convert pathname to unix style (including trailing slash) + path_topathname(path,NULL,smod); + char *end = smod+strlen(smod); + strcpy(end,mod); + strcat(end,"/__init__"); + strcat(end,ext); + + // check if file is really existing: try to open it + FILE *f = fopen(smod,"r"); + if(f) { + *end = 0; // clear module part ... we only need base path + fclose(f); + } + else + ok = false; + } + } + + if(ok) { + // convert path into slash style needed for Python + #if 1 + path_nameconform(smod,dir,PATH_STYLE_SLASH,PATH_TYPE_ABSOLUTE); + #else + #if FLEXT_OS == FLEXT_OS_WIN + char *colon = NULL; + #else + char *colon = strchr(smod,':'); + #endif + if(colon) { + *colon = 0; + strcpy(dir,"/Volumes/"); + strcat(dir,smod); + strcat(dir,colon+1); + } + else + strcpy(dir,smod); + #endif + return true; + } + else + // not found + return false; + #else + #pragma message("Not implemented"); + return false; + #endif + } + + static bool getmodulepath(const char *mod,char *dir,int len) + { + return + getmodulesub(mod,dir,len,".py") || + getmodulesub(mod,dir,len,".pyc") || + getmodulesub(mod,dir,len,".pyo"); + } + bool pybase::ImportModule(const char *name) { if(name) { ! if(modname == name) { ! // module with the same name is already loaded ! if(module) return true; ! } ! else ! modname = name; } else modname.clear(); + + UnimportModule(); return ReloadModule(); } *************** *** 438,466 **** void pybase::UnimportModule() { ! if(!module) return; ! ! FLEXT_ASSERT(dict && module_obj && module_dict); ! Py_DECREF(module); ! // reference count to module is not 0 here, altough probably the last instance was unloaded ! // Python retains one reference to the module all the time ! // we don't care ! module = NULL; ! dict = NULL; } bool pybase::ReloadModule() { - bool ok = false; - SetArgs(); PyObject *newmod; ! if(modname.length()) ! newmod = module ! ?PyImport_ReloadModule(module) ! :PyImport_ImportModule((char *)modname.c_str()); else { // if no module name given, take py module --- 548,586 ---- void pybase::UnimportModule() { ! if(module) { ! FLEXT_ASSERT(dict && module_obj && module_dict); ! Py_DECREF(module); ! // reference count to module is not 0 here, altough probably the last instance was unloaded ! // Python retains one reference to the module all the time ! // we don't care ! module = NULL; ! dict = NULL; ! } } bool pybase::ReloadModule() { SetArgs(); PyObject *newmod; ! if(modname.length()) { ! if(module) ! newmod = PyImport_ReloadModule(module); ! else { ! // search in module path ! char dir[1024]; ! if(getmodulepath(modname.c_str(),dir,sizeof(dir))) { ! AddToPath(dir); ! newmod = PyImport_ImportModule((char *)modname.c_str()); ! } ! else { ! PyErr_SetString(PyExc_ImportError,"Module not found in path"); ! newmod = NULL; ! } ! } ! } else { // if no module name given, take py module *************** *** 471,475 **** if(!newmod) { // unload faulty module ! if(module) UnimportModule(); } else { --- 591,596 ---- if(!newmod) { // unload faulty module ! UnimportModule(); ! return false; } else { *************** *** 477,526 **** module = newmod; dict = PyModule_GetDict(module); // borrowed ! ok = true; } - return ok; - } - - void pybase::GetModulePath(const char *mod,char *dir,int len) - { - #if FLEXT_SYS == FLEXT_SYS_PD - // uarghh... pd doesn't show its path for extra modules - - char *name; - int fd = open_via_path("",mod,".py",dir,&name,len,0); - if(fd > 0) close(fd); - else name = NULL; - - // if dir is current working directory... name points to dir - if(dir == name) strcpy(dir,"."); - #elif FLEXT_SYS == FLEXT_SYS_MAX - // how do i get the path in Max/MSP? - short path; - long type; - char smod[1024]; - strcat(strcpy(smod,mod),".py"); - if(!locatefile_extended(smod,&path,&type,&type,-1)) { - #if FLEXT_OS == FLEXT_OS_WIN - path_topathname(path,NULL,dir); - #else - // convert pathname to unix style - path_topathname(path,NULL,smod); - char *colon = strchr(smod,':'); - if(colon) { - *colon = 0; - strcpy(dir,"/Volumes/"); - strcat(dir,smod); - strcat(dir,colon+1); - } - else - strcpy(dir,smod); - #endif - } - else - // not found - *dir = 0; - #else - *dir = 0; - #endif } --- 598,603 ---- module = newmod; dict = PyModule_GetDict(module); // borrowed ! return true; } } Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** pyext.cpp 12 Dec 2005 14:42:54 -0000 1.45 --- pyext.cpp 23 Mar 2006 01:42:05 -0000 1.46 *************** *** 163,170 **** } - char dir[1024]; - GetModulePath(modnm,dir,sizeof(dir)); - AddToPath(dir); - ImportModule(modnm); } --- 163,166 ---- Index: py.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/py.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** py.cpp 11 Aug 2005 15:00:58 -0000 1.34 --- py.cpp 23 Mar 2006 01:42:05 -0000 1.35 *************** *** 157,166 **** } ! if(*modnm) { ! char dir[1024]; ! GetModulePath(modnm,dir,sizeof(dir)); ! AddToPath(dir); ImportModule(modnm); - } else ImportModule(NULL); --- 157,162 ---- } ! if(*modnm) ImportModule(modnm); else ImportModule(NULL); *************** *** 220,224 **** if(sn) { ! if(!module || !strcmp(sn,PyModule_GetName(module))) { ImportModule(sn); Register(GetRegistry(REGNAME)); --- 216,221 ---- if(sn) { ! // if(!module || !strcmp(sn,PyModule_GetName(module))) ! { ImportModule(sn); Register(GetRegistry(REGNAME)); *************** *** 245,249 **** { post(""); ! post("%s %s - python script object, (C)2002-2005 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__); --- 242,246 ---- { post(""); ! post("%s %s - python script object, (C)2002-2006 Thomas Grill",thisName(),PY__VERSION); #ifdef FLEXT_DEBUG post("DEBUG VERSION, compiled on " __DATE__ " " __TIME__);

1 0

externals/grill/py license.txt, 1.4, 1.5 py.vcproj, 1.29, 1.30 readme.txt, 1.47, 1.48
by Thomas Grill 23 Mar '06

23 Mar '06

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24934 Modified Files: license.txt py.vcproj readme.txt Log Message: added message bundle functionality (pyext.Bundle class) enable compiled-only scripts (without .py) small optimizations and fixes some optimizations and py reload fix better error message for reload with invalid args enable module packages (module/__init__.py[co]), now also for Max Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** py.vcproj 12 Dec 2005 00:18:42 -0000 1.29 --- py.vcproj 23 Mar 2006 01:42:04 -0000 1.30 *************** *** 87,91 **** Optimization="0" AdditionalIncludeDirectories="C:\data\prog\packs\pthreads\include;"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" RuntimeLibrary="1" --- 87,91 ---- Optimization="0" AdditionalIncludeDirectories="C:\data\prog\packs\pthreads\include;"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;xFLEXT_USECMEM" BasicRuntimeChecks="3" RuntimeLibrary="1" *************** *** 489,493 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib pthreadVC.lib" OutputFile=""C:\Programme\Gemeinsame Dateien\Cycling '74\externals\flext\py.mxe"" LinkIncremental="1" --- 489,493 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib" OutputFile=""C:\Programme\Gemeinsame Dateien\Cycling '74\externals\flext\py.mxe"" LinkIncremental="1" *************** *** 557,561 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib pthreadVC.lib" OutputFile="./max-msvc/py.mxe" LinkIncremental="1" --- 557,561 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib" OutputFile="./max-msvc/py.mxe" LinkIncremental="1" Index: license.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/license.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** license.txt 27 Feb 2005 04:57:30 -0000 1.4 --- license.txt 23 Mar 2006 01:42:04 -0000 1.5 *************** *** 1,4 **** py/pyext - python script objects for PD and MaxMSP ! Copyright (C) 2002-2005 Thomas Grill This program is free software; you can redistribute it and/or --- 1,4 ---- py/pyext - python script objects for PD and MaxMSP ! Copyright (C) 2002-2006 Thomas Grill This program is free software; you can redistribute it and/or *************** *** 29,33 **** --- 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 --- 29,33 ---- --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (C) 2001-2006 Thomas Grill This program is free software; you can redistribute it and/or Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** readme.txt 12 Dec 2005 00:18:42 -0000 1.47 --- readme.txt 23 Mar 2006 01:42:04 -0000 1.48 *************** *** 1,5 **** py/pyext - python script objects for PD and Max/MSP ! Copyright (c)2002-2005 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 1,5 ---- py/pyext - python script objects for PD and Max/MSP ! Copyright (c)2002-2006 Thomas Grill (gr(a)grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 19,35 **** It has been thoroughly tested with versions 2.2 to 2.4 - ---------------------------------------------------------------------------- - - Goals/features of the package: - - Access the flexibility of the python language in PD and MaxMSP ! PD - Load it as i library with e.g. "pd -lib py -path scripts" ! Check out the sample patches and scripts Description: --- 19,35 ---- It has been thoroughly tested with versions 2.2 to 2.4 + Check out the sample patches and scripts ! ---------------------------------------------------------------------------- + Installation: + PD version >= 0.38 - Add "py" to the Startup items ("binaries to load") + PD version < 0.38 - Load it as i library with e.g. "pd -lib py -path scripts" ! Max/MSP - Copy py-objectmappings.txt into the init folder and py.mxe (Windows) or py.mxo (OSX) into the externals folder. + ---------------------------------------------------------------------------- Description: *************** *** 98,102 **** - ADD: py can have multiple inlets for multiple function arguments (right inlets are non-triggering) - ADD: allow module.function syntax for py and pyext ! - FIX: pyext: cleanup up float vs. int ... first decision is made by tag, afterwards a conversion is tried - ADD: pym: object-oriented object... Python methods for any object type - ADD: py: allow all callables (also object constructors and builtins) --- 98,102 ---- - ADD: py can have multiple inlets for multiple function arguments (right inlets are non-triggering) - ADD: allow module.function syntax for py and pyext ! - FIX: pyext: cleanup float vs. int ... first decision is made by tag, afterwards a conversion is tried - ADD: pym: object-oriented object... Python methods for any object type - ADD: py: allow all callables (also object constructors and builtins) *************** *** 116,119 **** --- 116,121 ---- - ADD: Buffer.resize(frames,keep=1,zero=1) method - ADD: py.Bundle class to support flext message bundles + - ADD: enable usage of compiled-only modules (.py[co]) + - ADD: enable usage of module packages (with module/__init__.py[co]) 0.2.0: *************** *** 197,204 **** --- 199,208 ---- bugs: - crashes with long Python printouts + - pybase::GetModulePath should also look for .pyc and .pyo general: - Documentation and better example patches - better error reporting for runtime errors + - we should pre-scan and cache class methods features:

1 0

externals/gem2pdp pix_2pdp.h,1.3,1.4 pix_2pdp.cpp,1.6,1.7
by Jamie Tittle 22 Mar '06

22 Mar '06

Update of /cvsroot/pure-data/externals/gem2pdp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30274 Modified Files: pix_2pdp.h pix_2pdp.cpp Log Message: moved altivec code to GemPixConvert.h/cpp Index: pix_2pdp.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/pix_2pdp.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pix_2pdp.cpp 17 Mar 2006 03:08:15 -0000 1.6 --- pix_2pdp.cpp 22 Mar 2006 20:34:16 -0000 1.7 *************** *** 15,18 **** --- 15,20 ---- #include "yuv.h" + //#define __TIMING__ + CPPEXTERN_NEW(pix_2pdp) *************** *** 96,101 **** // YUV case GL_YUV422_GEM: { #ifdef __VEC__ ! YUV422_to_YV12_altivec(pY, pY2, pV, pU, psize); #else int row=gem_ysize>>1; --- 98,108 ---- // YUV case GL_YUV422_GEM: { + #ifdef __TIMING__ + UnsignedWide start, end; + Microseconds(&start); + #endif + #ifdef __VEC__ ! YUV422_to_YV12_altivec(pY, pY2, pV, pU, gem_image, gem_xsize, gem_ysize); #else int row=gem_ysize>>1; *************** *** 133,136 **** --- 140,148 ---- } #endif // __VEC__ + #ifdef __TIMING__ + Microseconds(&end); + float seconds = (float)(end.lo - start.lo) / 1000000.f; + post("UYVYtoYV12 frame time = %f", seconds); + #endif pdp_packet_pass_if_valid(m_pdpoutlet, &m_packet0); } break; *************** *** 161,236 **** } - #ifdef __VEC__ - void pix_2pdp :: YUV422_to_YV12_altivec(short*pY, short*pY2, short*pU, short*pV, size_t psize) - { - // UYVY UYVY UYVY UYVY - vector unsigned char *pixels1=(vector unsigned char *)gem_image; - vector unsigned char *pixels2=(vector unsigned char *)(gem_image+(gem_xsize*2)); - // PDP packet to be filled: - // first Y plane - vector signed short *py1 = (vector signed short *)pY; - // 2nd Y pixel - vector signed short *py2 = (vector signed short *)pY2; - // U plane - vector signed short *pCr = (vector signed short *)pU; - // V plane - vector signed short *pCb = (vector signed short *)pV; - vector signed short uvSub = (vector signed short)( 128, 128, 128, 128, - 128, 128, 128, 128 ); - vector signed short yShift = (vector signed short)( 7, 7, 7, 7, 7, 7, 7, 7 ); - vector signed short uvShift = (vector signed short)( 8, 8, 8, 8, 8, 8, 8, 8 ); - - vector signed short tempY1, tempY2, tempY3, tempY4, - tempUV1, tempUV2, tempUV3, tempUV4, tempUV5, tempUV6; - - vector unsigned char uvPerm = (vector unsigned char)( 16, 0, 17, 4, 18, 8, 19, 12, // u0..u3 - 20, 2, 21, 6, 22, 10, 23, 14 ); // v0..v3 - - vector unsigned char uPerm = (vector unsigned char)( 0, 1, 2, 3, 4, 5, 6, 7, - 16,17,18,19,20,21,22,23); - vector unsigned char vPerm = (vector unsigned char)( 8, 9, 10,11,12,13,14,15, - 24,25,26,27,28,29,30,31); - - vector unsigned char yPerm = (vector unsigned char)( 16, 1, 17, 3, 18, 5, 19, 7, // y0..y3 - 20, 9, 21, 11, 23, 13, 25, 15);// y4..y7 - vector unsigned char zeroVec = (vector unsigned char)(0); - - int row=gem_ysize>>1; - int cols=gem_xsize>>4; - - while(row--){ - int col=cols; - while(col--){ - tempUV1 = (vector signed short) vec_perm( *pixels1, zeroVec, uvPerm); - tempY1 = (vector signed short) vec_perm( *pixels1, zeroVec, yPerm); - tempY2 = (vector signed short) vec_perm( *pixels2, zeroVec, yPerm); - pixels1++;pixels2++; - - tempUV2 = (vector signed short) vec_perm( *pixels1, zeroVec, uvPerm); - tempY3 = (vector signed short) vec_perm( *pixels1, zeroVec, yPerm); - tempY4 = (vector signed short) vec_perm( *pixels2, zeroVec, yPerm); - pixels1++;pixels2++; - - tempUV3 = vec_sub( tempUV1, uvSub ); - tempUV4 = vec_sub( tempUV2, uvSub ); - tempUV5 = vec_sl( tempUV3, uvShift ); - tempUV6 = vec_sl( tempUV4, uvShift ); - - *pCb = vec_perm( tempUV5, tempUV6, uPerm ); - *pCr = vec_perm( tempUV5, tempUV6, vPerm ); - pCr++; pCb++; - - *py1++ = vec_sl( tempY1, yShift); - *py2++ = vec_sl( tempY2, yShift); - *py1++ = vec_sl( tempY3, yShift); - *py2++ = vec_sl( tempY4, yShift); - } - - py1+=(gem_xsize>>3); py2+=(gem_xsize>>3); - pixels1+=(gem_xsize*2)>>4; pixels2+=(gem_xsize*2)>>4; - } - } - #endif - void pix_2pdp::obj_setupCallback(t_class *classPtr) { --- 173,176 ---- Index: pix_2pdp.h =================================================================== RCS file: /cvsroot/pure-data/externals/gem2pdp/pix_2pdp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pix_2pdp.h 17 Mar 2006 03:08:15 -0000 1.3 --- pix_2pdp.h 22 Mar 2006 20:34:16 -0000 1.4 *************** *** 7,11 **** * Many thanks to IOhannes M Zmölnig * ! * Copyright (c) 2005 Georg Holzmann <grh(a)mur.at> * */ --- 7,11 ---- * Many thanks to IOhannes M Zmölnig * ! * Copyright (c) 2005-06 Georg Holzmann <grh(a)mur.at> * */ *************** *** 15,18 **** --- 15,19 ---- #include "Base/GemPixObj.h" + #include "pdp-light.h" *************** *** 36,44 **** // pdp processing virtual void bangMess(void); - - // altivec processing - #ifdef __VEC__ - virtual void YUV422_to_YV12_altivec(short*pY, short*pY2, short*pU, short*pV, size_t psize); - #endif // the pixBlock with the current image --- 37,40 ----

1 0

externals Makefile,1.42,1.43
by Hans-Christoph Steiner 21 Mar '06

21 Mar '06

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1039 Modified Files: Makefile Log Message: moved pd patches out of the separate 'pd' folder into the root of the mapping project so that its easy to make the development environment match the final install environment Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Makefile 21 Mar 2006 15:30:40 -0000 1.42 --- Makefile 21 Mar 2006 16:19:24 -0000 1.43 *************** *** 739,743 **** # no compiled objects yet... # install -p $(MAPPING_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(MAPPING_NAME) ! install -p $(externals_src)/mapping/pd/*.pd $(objectsdir)/$(MAPPING_NAME) install -d $(helpdir)/$(MAPPING_NAME) install -p $(externals_src)/mapping/help/*.pd \ --- 739,743 ---- # no compiled objects yet... # install -p $(MAPPING_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(MAPPING_NAME) ! install -p $(externals_src)/mapping/*.pd $(objectsdir)/$(MAPPING_NAME) install -d $(helpdir)/$(MAPPING_NAME) install -p $(externals_src)/mapping/help/*.pd \

1 0

[PD-cvs] externals/mapping/pd amplitude_n.pd, 1.1, NONE autoscale.pd, 1.2, NONE breakpoint.pd, 1.1, NONE buttongate.pd, 1.1, NONE cartesian.pd, 1.1, NONE curve.pd, 1.4, NONE curve_exp.pd, 1.3, NONE curve_graph.pd, 1.1, NONE curve_log.pd, 1.2, NONE curve_power.pd, 1.2, NONE curve_root.pd, 1.2, NONE debounce.pd, 1.1, NONE degrees2mapping.pd, 1.1, NONE delay_n.pd, 1.1, NONE desegment.pd, 1.1, NONE diff_n.pd, 1.1, NONE disjoin.pd, 1.3, NONE distance.pd, 1.1, NONE distance2d.pd, 1.1, NONE distance_n.pd, 1.1, NON
by Hans-Christoph Steiner 21 Mar '06

21 Mar '06

Update of /cvsroot/pure-data/externals/mapping/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32681/pd Removed Files: amplitude_n.pd autoscale.pd breakpoint.pd buttongate.pd cartesian.pd curve.pd curve_exp.pd curve_graph.pd curve_log.pd curve_power.pd curve_root.pd debounce.pd degrees2mapping.pd delay_n.pd desegment.pd diff_n.pd disjoin.pd distance.pd distance2d.pd distance_n.pd downsample.pd fir.pd gaussian.pd hysteresis.pd iir.pd join.pd keygate.pd last_n.pd listto.pd local_max.pd local_min.pd lop.pd mapping2degrees.pd mapping2radians.pd max_n.pd mean_n.pd median_3.pd median_5.pd median_7.pd min_n.pd multi_slider.pd nl.pd notescale.pd oscillo.pd pmfilter.pd pmfilter_2d.pd pmfilter_3d.pd polar.pd radians2mapping.pd resample.pd reverse.pd rnd-stat.pd segment.pd segment4.pd sinusoid.pd spiral.pd split_n.pd stepper.pd test_n.pd timeroll.pd tolist.pd upsample.pd vector.pd wave.pd wave_loop.pd Log Message: moved pd patches out of the separate 'pd' folder into the root of this project so that its easy to make the development environment match the final install environment --- reverse.pd DELETED --- --- local_min.pd DELETED --- --- autoscale.pd DELETED --- --- resample.pd DELETED --- --- curve_root.pd DELETED --- --- max_n.pd DELETED --- --- notescale.pd DELETED --- --- downsample.pd DELETED --- --- mapping2radians.pd DELETED --- --- oscillo.pd DELETED --- --- gaussian.pd DELETED --- --- keygate.pd DELETED --- --- curve_graph.pd DELETED --- --- radians2mapping.pd DELETED --- --- wave_loop.pd DELETED --- --- sinusoid.pd DELETED --- --- test_n.pd DELETED --- --- rnd-stat.pd DELETED --- --- debounce.pd DELETED --- --- buttongate.pd DELETED --- --- tolist.pd DELETED --- --- pmfilter_3d.pd DELETED --- --- distance2d.pd DELETED --- --- median_5.pd DELETED --- --- breakpoint.pd DELETED --- --- listto.pd DELETED --- --- local_max.pd DELETED --- --- curve.pd DELETED --- --- distance.pd DELETED --- --- vector.pd DELETED --- --- fir.pd DELETED --- --- degrees2mapping.pd DELETED --- --- segment.pd DELETED --- --- nl.pd DELETED --- --- multi_slider.pd DELETED --- --- mean_n.pd DELETED --- --- pmfilter_2d.pd DELETED --- --- median_3.pd DELETED --- --- desegment.pd DELETED --- --- curve_log.pd DELETED --- --- upsample.pd DELETED --- --- hysteresis.pd DELETED --- --- stepper.pd DELETED --- --- spiral.pd DELETED --- --- amplitude_n.pd DELETED --- --- mapping2degrees.pd DELETED --- --- min_n.pd DELETED --- --- iir.pd DELETED --- --- split_n.pd DELETED --- --- disjoin.pd DELETED --- --- diff_n.pd DELETED --- --- cartesian.pd DELETED --- --- timeroll.pd DELETED --- --- join.pd DELETED --- --- polar.pd DELETED --- --- distance_n.pd DELETED --- --- last_n.pd DELETED --- --- wave.pd DELETED --- --- curve_exp.pd DELETED --- --- segment4.pd DELETED --- --- lop.pd DELETED --- --- pmfilter.pd DELETED --- --- curve_power.pd DELETED --- --- delay_n.pd DELETED --- --- median_7.pd DELETED ---

1 0

externals Makefile,1.41,1.42
by Hans-Christoph Steiner 21 Mar '06

21 Mar '06

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8117 Modified Files: Makefile Log Message: fixed [hid] compilation on GNU/Linux after HID Utilities fix on Mac OS X Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Makefile 19 Mar 2006 05:49:56 -0000 1.41 --- Makefile 21 Mar 2006 15:30:40 -0000 1.42 *************** *** 572,578 **** $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a: # Apple changed the XCode CLI tool's name in xcode2... arg cd $(HID_UTILITIES_SOURCE) && \ ! (test -x /usr/bin/xcodebuild && /usr/bin/xcodebuild) || pbxbuild ! $(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) \ --- 572,580 ---- $(HID_UTILITIES_SOURCE)/build/libHIDUtilities.a: # Apple changed the XCode CLI tool's name in xcode2... arg + # if on non-Mac OS X, this target just echos a message cd $(HID_UTILITIES_SOURCE) && \ ! (test -x /usr/bin/xcodebuild && /usr/bin/xcodebuild) || \ ! (test -x /usr/bin/pbxbuild && /usr/bin/pbxbuild) || \ ! echo "Not building Apple HID Utilities" $(externals_src)/hcs/hid/hid.$(EXTENSION): $(HID_OBJECTS) \

1 0

externals/iem/pdoctave Readme.txt,1.1,1.2
by Franz Zotter 21 Mar '06

21 Mar '06

Update of /cvsroot/pure-data/externals/iem/pdoctave In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29815 Modified Files: Readme.txt Log Message: lines added to makefile, thanks to Gerda Strobl's first foreign usage. Index: Readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/iem/pdoctave/Readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Readme.txt 22 Feb 2006 13:16:36 -0000 1.1 --- Readme.txt 21 Mar 2006 08:54:08 -0000 1.2 *************** *** 8,11 **** --- 8,25 ---- That's why the use of this external is only recommended to developers. + Following packages have to be installed: + puredata (+sources) + octave + octave-headers + + Nice to have: + bbogart's "entry" pd-external + + INSTALLING: + please edit the linker parameters in "Makefile" to match your pd-sources paths + type "make" + TESTING: + "pd -lib pdoctave test_pdoctave.pd" + This code collection consists of four pd-objects:

1 0

externals/postlude/dssi/src dssi~.c,1.9,1.10
by Jamie Bullock 20 Mar '06

20 Mar '06

Update of /cvsroot/pure-data/externals/postlude/dssi/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28827/src Modified Files: dssi~.c Log Message: Modified DSP vector handling. Index: dssi~.c =================================================================== RCS file: /cvsroot/pure-data/externals/postlude/dssi/src/dssi~.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** dssi~.c 17 Mar 2006 17:08:49 -0000 1.9 --- dssi~.c 20 Mar 2006 14:54:19 -0000 1.10 *************** *** 527,532 **** --- 527,536 ---- #if DEBUG post("Global ctrl input number = %d", ctrl_input_index); + post("Global ctrl input value = %.2f", value); #endif + + + /* set the appropriate control port value */ x->plugin_ControlDataInput[portno] = value; *************** *** 1733,1749 **** static void dssi_bang(t_dssi_tilde *x) { ! post("Running instances of %s", x->descriptor->LADSPA_Plugin->Label); } static t_int *dssi_tilde_perform(t_int *w) { ! int N = (int)(w[1]); ! t_dssi_tilde *x = (t_dssi_tilde *)(w[2]); int i, n, timediff, framediff, instance = 0; ! if(x->dsp){ for(i = 0; i < x->plugin_ins; i++) ! memcpy(x->plugin_InputBuffers[i], x->inlets[i], N * sizeof(LADSPA_Data)); --- 1737,1757 ---- static void dssi_bang(t_dssi_tilde *x) { ! post("dssi~: running %d instances of %s", x->n_instances, ! x->descriptor->LADSPA_Plugin->Label); } static t_int *dssi_tilde_perform(t_int *w) { ! int N = (t_int)(w[2]); ! t_dssi_tilde *x = (t_dssi_tilde *)(w[1]); ! t_float **inputs = (t_float **)(&w[3]); ! t_float **outputs = (t_float **)(&w[3] + x->plugin_ins); int i, n, timediff, framediff, instance = 0; ! /*See comment for dssi_tilde_plug_plugin if(x->dsp){ + x->dsp_loop = 1;*/ for(i = 0; i < x->plugin_ins; i++) ! memcpy(x->plugin_InputBuffers[i], inputs[i], N * sizeof(LADSPA_Data)); *************** *** 1825,1833 **** } for(i = 0; i < x->plugin_outs; i++) ! memcpy(x->outlets[i], x->plugin_OutputBuffers[i], N * sizeof(LADSPA_Data)); ! } ! return (w+3); } --- 1833,1848 ---- } + for(i = 0; i < x->plugin_outs; i++) ! memcpy(outputs[i], (t_float *)x->plugin_OutputBuffers[i], N * sizeof(LADSPA_Data)); ! ! /* ! for(i = 0; i < x->plugin_outs; i++) ! memcpy(x->outlets[i], (t_outlet *)x->plugin_OutputBuffers[i], N * ! sizeof(LADSPA_Data));*/ ! /* x->dsp_loop = 0; ! }*/ ! return w + (x->plugin_ins + x->plugin_outs + 3); } *************** *** 1835,1839 **** { if(x->n_instances){ ! int n, m; t_float **outlets = (t_float **)x->outlets; t_float **inlets = (t_float **)x->inlets; --- 1850,1882 ---- { if(x->n_instances){ ! ! ! t_int *dsp_vector, i, N, M; ! ! M = x->plugin_ins + x->plugin_outs + 2; ! ! dsp_vector = (t_int *) getbytes(M * sizeof(t_int)); ! ! dsp_vector[0] = (t_int)x; ! dsp_vector[1] = (t_int)sp[0]->s_n; ! ! for(i = 2; i < M; i++) ! dsp_vector[i] = (t_int)sp[i - 1]->s_vec; ! ! dsp_addv(dssi_tilde_perform, M, dsp_vector); ! ! ! /* int n, m; ! ! t_float **outlets; ! t_float **inlets; ! ! for(n = 0, m = 1; n < x->plugin_ins; n++, m++) ! inlets[n] = sp[m]->s_vec; ! for(n = 0; n < x->plugin_outs; n++, ++m) ! outlets[n] = sp[m]->s_vec; ! ! */ /* ! t_float **outlets = (t_float **)x->outlets; t_float **inlets = (t_float **)x->inlets; *************** *** 1845,1850 **** for(n = 0; n < x->plugin_outs; n++) *outlets++ = sp[m++]->s_vec; ! } ! dsp_add(dssi_tilde_perform, 2, sp[0]->s_n, x); } --- 1888,1893 ---- for(n = 0; n < x->plugin_outs; n++) *outlets++ = sp[m++]->s_vec; ! */ } ! /* dsp_add(dssi_tilde_perform, 2, sp[0]->s_n, x); */ } *************** *** 1932,1941 **** free((t_float *)x->plugin_OutputBuffers); - /* Have a little nap so PD can catch up */ /*sleep(1);*/ ! for(i = 0; i < x->plugin_outs; i++) ! outlet_free(x->outlets[i]); ! for(i = 0; i < x->plugin_ins; i++) ! inlet_free(x->inlets[i]); outlet_free(x->control_outlet); free(x->dll_name); --- 1975,1990 ---- free((t_float *)x->plugin_OutputBuffers); /*sleep(1);*/ ! if(x->plugin_ins){ ! for(i = 0; i < x->plugin_ins; i++) ! inlet_free((t_inlet *)x->inlets[i]); ! freebytes(x->inlets, x->plugin_ins * sizeof(t_inlet *)); ! } ! ! if(x->plugin_outs){ ! for(i = 0; i < x->plugin_outs; i++) ! outlet_free((t_outlet *)x->outlets[i]); ! freebytes(x->outlets, x->plugin_outs * sizeof(t_outlet *)); ! } outlet_free(x->control_outlet); free(x->dll_name); *************** *** 1968,1971 **** --- 2017,2021 ---- x->n_instances = 0; x->dsp = 0; + x->dsp_loop = 0; x->plugin_ins = x->plugin_outs = x->plugin_controlIns = x->plugin_controlOuts = 0; *************** *** 2139,2152 **** post("dssi~: ready for input"); - x->dsp = 1; } return (void *)x; } static void dssi_tilde_plug_plugin(t_dssi_tilde *x, t_symbol *s, int argc, t_atom *argv){ x->dsp = 0; dssi_tilde_quit_plugin(x); ! dssi_tilde_free_plugin(x); dssi_tilde_init_plugin(x); dssi_tilde_load_plugin(x, argc, argv); --- 2189,2208 ---- post("dssi~: ready for input"); } return (void *)x; } + + /* This method is currently disabled. PD's inlet/outlet handling seems buggy if you try to create ins/outs on the fly. Needs further investigation ...*/ static void dssi_tilde_plug_plugin(t_dssi_tilde *x, t_symbol *s, int argc, t_atom *argv){ x->dsp = 0; dssi_tilde_quit_plugin(x); ! while(1){ ! if(!x->dsp_loop){ ! dssi_tilde_free_plugin(x); ! break; ! } ! } dssi_tilde_init_plugin(x); dssi_tilde_load_plugin(x, argc, argv); *************** *** 2154,2157 **** --- 2210,2219 ---- } + static void dssi_tilde_activate_plugin(t_dssi_tilde *x){ + + x->dsp = 1; + + } + static void *dssi_tilde_new(t_symbol *s, t_int argc, t_atom *argv){ *************** *** 2200,2206 **** class_addmethod (dssi_tilde_class,(t_method)dssi_tilde_reset, gensym ("reset"), A_DEFFLOAT, 0); ! class_addmethod (dssi_tilde_class,(t_method)dssi_tilde_plug_plugin, ! gensym ("plug"),A_GIMME,0);/* ! class_addmethod (dssi_tilde_class,(t_method)dssi_tilde_active, gensym ("active"),A_DEFFLOAT,0);*/ class_sethelpsymbol(dssi_tilde_class, gensym("help-dssi")); --- 2262,2268 ---- class_addmethod (dssi_tilde_class,(t_method)dssi_tilde_reset, gensym ("reset"), A_DEFFLOAT, 0); ! /* class_addmethod (dssi_tilde_class,(t_method)dssi_tilde_plug_plugin, ! gensym ("plug"),A_GIMME,0); ! class_addmethod (dssi_tilde_class,(t_method)dssi_tilde_activate_plugin, gensym ("active"),A_DEFFLOAT,0);*/ class_sethelpsymbol(dssi_tilde_class, gensym("help-dssi"));

1 0

externals/iem/pdoctave Makefile,NONE,1.1
by Franz Zotter 20 Mar '06

20 Mar '06

Update of /cvsroot/pure-data/externals/iem/pdoctave In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2585 Added Files: Makefile Log Message: Sorry, I forgot the Makefile. --- NEW FILE: Makefile --- current: all .SUFFIXES: .pd_linux INCLUDE = -I. -I/usr/local/lib/pd/src -I/home/fzotter/downloads/pd-0.39-0/pd/obj LDFLAGS = -export-dynamic -shared LIB = -ldl -lm -lpthread #select either the DBG and OPT compiler flags below: CFLAGS = -DPD -DUNIX -Wno-unused \ -Wno-parentheses -Wno-switch -O6 -funroll-loops -fomit-frame-pointer \ -DDL_OPEN SYSTEM = $(shell uname -m) # the sources SRC = pdoctave_dataframe.c \ pdoctave.c \ pdoctave_send.c \ pdoctave_command.c \ pdoctave_get.c TARGET = ./pdoctave.pd_linux #TARGET2 = ./pdoctave_send.pd_linux OBJ = $(SRC:.c=.o) # # ------------------ targets ------------------------------------ # install: all sudo cp pdoctave.pd_linux /usr/local/lib/pd/externs/ clean: rm -f $(OBJ) read_shared_mem.oct write_shared_mem.o write_shared_mem.oct read_shared_mem.o all: pdoctave #all: pdoctave pdoctave_send pdoctave: $(OBJ) read_shared_mem.oct write_shared_mem.oct @echo :: $(OBJ) ld $(LDFLAGS) -o $(TARGET) $(OBJ) $(LIB) strip --strip-unneeded $(TARGET) #rm *.o #pdoctave_send: $(OBJ2) # # @echo :: $(OBJ2) # # ld $(LDFLAGS) -o $(TARGET2) $(OBJ) $(LIB) # strip --strip-unneeded $(TARGET2) $(OBJ) : %.o : %.c #touch $*.c cc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c read_shared_mem.oct: read_shared_mem.cc mkoctfile read_shared_mem.cc -c -o read_shared_mem.o mkoctfile read_shared_mem.o pdoctave_dataframe.o -o read_shared_mem.oct write_shared_mem.oct: write_shared_mem.cc mkoctfile write_shared_mem.cc -c -o write_shared_mem.o mkoctfile write_shared_mem.o pdoctave_dataframe.o -o write_shared_mem.oct pdoctave_send.o: pdoctave_send.c pdoctave_command.o: pdoctave_command.c pdoctave_get.o: pdoctave_get.c

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

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 2006