Pd-cvs May 2008

pd-cvs@lists.iem.at

16 participants
271 discussions

SF.net SVN: pure-data: [9886] trunk/externals/pdvjtools/imagegrid/imagegrid .c
by sergi_ll＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9886 http://pure-data.svn.sourceforge.net/pure-data/?rev=9886&view=rev Author: sergi_ll Date: 2008-05-23 17:20:06 -0700 (Fri, 23 May 2008) Log Message: ----------- file formats to uppercase Modified Paths: -------------- trunk/externals/pdvjtools/imagegrid/imagegrid.c Modified: trunk/externals/pdvjtools/imagegrid/imagegrid.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-24 00:12:45 UTC (rev 9885) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-24 00:20:06 UTC (rev 9886) @@ -480,14 +480,23 @@ t1 = strtok(NULL,".") ) strcpy(extensio,t1); if(strcmp(extensio,"bmp")==0) retorn = 1; + if(strcmp(extensio,"BMP")==0) retorn = 1; if(strcmp(extensio,"eps")==0) retorn = 1; + if(strcmp(extensio,"EPS")==0) retorn = 1; if(strcmp(extensio,"gif")==0) retorn = 1; + if(strcmp(extensio,"GIF")==0) retorn = 1; if(strcmp(extensio,"jpg")==0) retorn = 1; + if(strcmp(extensio,"JPG")==0) retorn = 1; if(strcmp(extensio,"jpeg")==0) retorn = 1; + if(strcmp(extensio,"JPEG")==0) retorn = 1; if(strcmp(extensio,"png")==0) retorn = 1; + if(strcmp(extensio,"PNG")==0) retorn = 1; if(strcmp(extensio,"ppm")==0) retorn = 1; + if(strcmp(extensio,"PPM")==0) retorn = 1; if(strcmp(extensio,"tif")==0) retorn = 1; + if(strcmp(extensio,"TIF")==0) retorn = 1; if(strcmp(extensio,"tiff")==0) retorn = 1; + if(strcmp(extensio,"TIFF")==0) retorn = 1; return (retorn); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9885] trunk/externals/pdvjtools/pdp_freeframe/ pdp_freeframe-help.pd
by lluisbigorda＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9885 http://pure-data.svn.sourceforge.net/pure-data/?rev=9885&view=rev Author: lluisbigorda Date: 2008-05-23 17:12:45 -0700 (Fri, 23 May 2008) Log Message: ----------- added the freeframe link in the help patch Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd Modified: trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd 2008-05-24 00:07:14 UTC (rev 9884) +++ trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd 2008-05-24 00:12:45 UTC (rev 9885) @@ -1,25 +1,25 @@ #N canvas 0 0 996 665 10; #X obj 43 335 pdp_freeframe; -#X floatatom 149 338 5 0 0 0 - - -; +#X floatatom 337 104 5 0 0 0 - - -; #X obj 46 115 pdp_qt; #X obj 46 45 metro 40; #X msg 46 -17 bang; #X msg 107 45 loop 1; #X obj 41 507 pdp_xv; -#X obj 46 247 pdp_scale 320 240; -#X obj 194 336 hradio 15 1 0 44 empty empty empty 0 -6 0 8 -262144 +#X obj 46 179 pdp_scale 320 240; +#X obj 382 102 hradio 15 1 0 44 empty empty empty 0 -6 0 8 -262144 -1 -1 0; -#X obj 261 171 hsl 128 15 0 1 0 0 empty vparam3 empty -2 -6 0 8 -262144 +#X obj 391 228 hsl 128 15 0 1 0 0 empty vparam3 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X obj 401 171 hsl 128 15 0 1 0 0 empty vparam4 empty -2 -6 0 8 -262144 +#X obj 531 228 hsl 128 15 0 1 0 0 empty vparam4 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X obj 541 171 hsl 128 15 0 1 0 0 empty vparam5 empty -2 -6 0 8 -262144 +#X obj 671 228 hsl 128 15 0 1 0 0 empty vparam5 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X msg 258 191 param 3 \$1; -#X msg 398 190 param 4 \$1; -#X msg 539 190 param 5 \$1; -#X text 195 317 Select the plugin; -#X text 258 72 Adjust plugin parameters.; +#X msg 388 248 param 3 \$1; +#X msg 528 247 param 4 \$1; +#X msg 669 247 param 5 \$1; +#X text 384 82 Select the plugin; +#X text 388 129 Adjust plugin parameters.; #X msg 164 45 open \$1; #X obj 164 23 openpanel; #X text 95 -17 Load a mov file; @@ -27,34 +27,30 @@ #X text 249 488 <-- plugin name; #X floatatom 115 466 5 0 0 0 - - -; #X text 163 464 <-- number of parameters; -#X obj 46 176 pdp_spigot; -#X obj 119 148 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 -1; -#X obj 89 215 pdp_scale 192 168; #X obj 241 47 pdp_v4l; #X obj 241 20 metro 40; #X msg 241 -8 bang; #X text 214 438 <-- parameter name; #X text 241 410 <-- parameter type; #X text 257 381 <-- parameter default; -#X obj 263 112 hsl 128 15 0 1 0 0 empty vparam0 empty -2 -6 0 8 -262144 +#X obj 393 169 hsl 128 15 0 1 0 0 empty vparam0 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X obj 401 112 hsl 128 15 0 1 0 0 empty vparam1 empty -2 -6 0 8 -262144 --1 -1 2391 1; -#X obj 542 112 hsl 128 15 0 1 0 0 empty vparam2 empty -2 -6 0 8 -262144 +#X obj 531 169 hsl 128 15 0 1 0 0 empty vparam1 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X obj 261 234 hsl 128 15 0 1 0 0 empty vparam6 empty -2 -6 0 8 -262144 +#X obj 672 169 hsl 128 15 0 1 0 0 empty vparam2 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X obj 402 234 hsl 128 15 0 1 0 0 empty vparam7 empty -2 -6 0 8 -262144 +#X obj 391 291 hsl 128 15 0 1 0 0 empty vparam6 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X obj 544 234 hsl 128 15 0 1 0 0 empty vparam8 empty -2 -6 0 8 -262144 +#X obj 532 291 hsl 128 15 0 1 0 0 empty vparam7 empty -2 -6 0 8 -262144 -1 -1 0 1; -#X msg 260 131 param 0 \$1; -#X msg 398 131 param 1 \$1; -#X msg 539 131 param 2 \$1; -#X msg 260 254 param 6 \$1; -#X msg 399 253 param 7 \$1; -#X msg 541 253 param 8 \$1; +#X obj 674 291 hsl 128 15 0 1 0 0 empty vparam8 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X msg 390 188 param 0 \$1; +#X msg 528 188 param 1 \$1; +#X msg 669 188 param 2 \$1; +#X msg 390 311 param 6 \$1; +#X msg 529 310 param 7 \$1; +#X msg 671 310 param 8 \$1; #N canvas 0 0 996 665 pname 0; #X obj 51 119 l2s; #X obj 80 119 l2s; @@ -108,15 +104,15 @@ #X connect 21 0 18 0; #X connect 21 0 19 0; #X restore 146 438 pd pname; -#X symbolatom 260 93 18 0 0 0 - ffparam0 -; -#X symbolatom 399 92 18 0 0 0 - ffparam1 -; -#X symbolatom 538 92 18 0 0 0 - ffparam2 -; -#X symbolatom 261 154 18 0 0 0 - ffparam3 -; -#X symbolatom 400 153 18 0 0 0 - ffparam4 -; -#X symbolatom 539 153 18 0 0 0 - ffparam5 -; -#X symbolatom 261 214 18 0 0 0 - ffparam6 -; -#X symbolatom 400 213 18 0 0 0 - ffparam7 -; -#X symbolatom 539 213 18 0 0 0 - ffparam8 -; +#X symbolatom 390 150 18 0 0 0 - ffparam0 -; +#X symbolatom 529 149 18 0 0 0 - ffparam1 -; +#X symbolatom 668 149 18 0 0 0 - ffparam2 -; +#X symbolatom 391 211 18 0 0 0 - ffparam3 -; +#X symbolatom 530 210 18 0 0 0 - ffparam4 -; +#X symbolatom 669 210 18 0 0 0 - ffparam5 -; +#X symbolatom 391 271 18 0 0 0 - ffparam6 -; +#X symbolatom 530 270 18 0 0 0 - ffparam7 -; +#X symbolatom 669 270 18 0 0 0 - ffparam8 -; #N canvas 0 0 996 665 default 0; #X obj 97 86 route 0 1 2 3 4 5 6 7 8; #X obj 97 51 inlet; @@ -154,20 +150,24 @@ #X connect 4 0 13 0; #X connect 5 0 4 0; #X restore 180 380 pd default; -#X text 487 440 FreeFrame host for Pure Data Packet version 0.3; -#X text 489 455 by Lluis Gomez i Bigorda (lluis(a)artefacte.org); -#X text 508 468 & Yves Degoyon (ydegoyon(a)free.fr); -#X text 489 483 using GPL code from http://freeframe.sf.net; -#X text 489 498 and Pete Warden http://petewarden.com; +#X text 493 440 FreeFrame host for Pure Data Packet version 0.3; +#X text 495 455 by Lluis Gomez i Bigorda (lluis(a)artefacte.org); +#X text 514 468 & Yves Degoyon (ydegoyon(a)free.fr); +#X text 495 483 using GPL code from http://freeframe.sf.net; +#X text 495 498 and Pete Warden http://petewarden.com; #X obj 164 410 print type; +#X msg 344 46 pluginsdir /usr/lib/FreeFrame; +#X text 341 -10 You need the FreeFrame plugins to use with this object. +Install them from http://sourceforge.net/projects/freeframe/ And then +use this message to load.; #X connect 0 0 6 0; #X connect 0 1 20 0; #X connect 0 2 22 0; -#X connect 0 3 45 0; -#X connect 0 4 61 0; -#X connect 0 5 55 0; +#X connect 0 3 42 0; +#X connect 0 4 58 0; +#X connect 0 5 52 0; #X connect 1 0 0 1; -#X connect 2 0 24 0; +#X connect 2 0 7 0; #X connect 3 0 2 0; #X connect 4 0 3 0; #X connect 4 0 5 0; @@ -183,24 +183,21 @@ #X connect 14 0 0 0; #X connect 17 0 2 0; #X connect 18 0 17 0; -#X connect 22 0 45 1; -#X connect 22 0 55 1; +#X connect 22 0 42 1; +#X connect 22 0 52 1; #X connect 24 0 7 0; -#X connect 24 1 26 0; -#X connect 25 0 24 1; -#X connect 26 0 0 0; -#X connect 27 0 24 0; -#X connect 28 0 27 0; -#X connect 29 0 28 0; +#X connect 25 0 24 0; +#X connect 26 0 25 0; +#X connect 30 0 36 0; +#X connect 31 0 37 0; +#X connect 32 0 38 0; #X connect 33 0 39 0; #X connect 34 0 40 0; #X connect 35 0 41 0; -#X connect 36 0 42 0; -#X connect 37 0 43 0; -#X connect 38 0 44 0; +#X connect 36 0 0 0; +#X connect 37 0 0 0; +#X connect 38 0 0 0; #X connect 39 0 0 0; #X connect 40 0 0 0; #X connect 41 0 0 0; -#X connect 42 0 0 0; -#X connect 43 0 0 0; -#X connect 44 0 0 0; +#X connect 59 0 0 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9884] trunk/externals/pdvjtools/pdp_freeframe
by eighthave＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9884 http://pure-data.svn.sourceforge.net/pure-data/?rev=9884&view=rev Author: eighthave Date: 2008-05-23 17:07:14 -0700 (Fri, 23 May 2008) Log Message: ----------- ran emacs' auto indent to make Pd-style indentation Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c Modified: trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h 2008-05-24 00:05:54 UTC (rev 9883) +++ trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h 2008-05-24 00:07:14 UTC (rev 9884) @@ -62,9 +62,9 @@ #elif defined(__linux__) || defined(__APPLE__) -typedef unsigned int DWORD; -typedef void *LPVOID; -typedef unsigned char BYTE; + typedef unsigned int DWORD; + typedef void *LPVOID; + typedef unsigned char BYTE; #endif @@ -127,59 +127,59 @@ * FreeFrame types */ -typedef struct PlugInfoStructTag { - DWORD APIMajorVersion; - DWORD APIMinorVersion; - BYTE uniqueID[4]; /* 4 chars uniqueID - not null terminated */ - BYTE pluginName[16]; /* 16 chars plugin friendly name - not null terminated */ - DWORD pluginType; /* Effect or source */ -} PlugInfoStruct; + typedef struct PlugInfoStructTag { + DWORD APIMajorVersion; + DWORD APIMinorVersion; + BYTE uniqueID[4]; /* 4 chars uniqueID - not null terminated */ + BYTE pluginName[16]; /* 16 chars plugin friendly name - not null terminated */ + DWORD pluginType; /* Effect or source */ + } PlugInfoStruct; -typedef struct PlugExtendedInfoStructTag { - DWORD PluginMajorVersion; - DWORD PluginMinorVersion; - char* Description; - char* About; - DWORD FreeFrameExtendedDataSize; - void* FreeFrameExtendedDataBlock; -} PlugExtendedInfoStruct; + typedef struct PlugExtendedInfoStructTag { + DWORD PluginMajorVersion; + DWORD PluginMinorVersion; + char* Description; + char* About; + DWORD FreeFrameExtendedDataSize; + void* FreeFrameExtendedDataBlock; + } PlugExtendedInfoStruct; -typedef struct VideoInfoStructTag { - DWORD frameWidth; /* width of frame in pixels */ - DWORD frameHeight; /* height of frame in pixels */ - DWORD bitDepth; /* enumerated indicator of bit depth of video */ - /* 0 = 16 bit 5-6-5 1 = 24bit packed 2 = 32bit */ - DWORD orientation; /* video frame orientation meaningful values: - 1 = origin at top left 2 = origin at bottom left */ + typedef struct VideoInfoStructTag { + DWORD frameWidth; /* width of frame in pixels */ + DWORD frameHeight; /* height of frame in pixels */ + DWORD bitDepth; /* enumerated indicator of bit depth of video */ + /* 0 = 16 bit 5-6-5 1 = 24bit packed 2 = 32bit */ + DWORD orientation; /* video frame orientation meaningful values: + 1 = origin at top left 2 = origin at bottom left */ -} VideoInfoStruct; + } VideoInfoStruct; -typedef struct ProcessFrameCopyStructTag { - DWORD numInputFrames; - void** InputFrames; - void* OutputFrame; -} ProcessFrameCopyStruct; + typedef struct ProcessFrameCopyStructTag { + DWORD numInputFrames; + void** InputFrames; + void* OutputFrame; + } ProcessFrameCopyStruct; -typedef struct SetParameterStructTag { - DWORD index; - float value; -} SetParameterStruct; + typedef struct SetParameterStructTag { + DWORD index; + float value; + } SetParameterStruct; -typedef union { - DWORD ivalue; - float fvalue; - char *svalue; -} ParameterValue; + typedef union { + DWORD ivalue; + float fvalue; + char *svalue; + } ParameterValue; -typedef union plugMainUnionTag { - DWORD ivalue; - float fvalue; - VideoInfoStruct *VISvalue; - PlugInfoStruct *PISvalue; - char *svalue; -} plugMainUnion; + typedef union plugMainUnionTag { + DWORD ivalue; + float fvalue; + VideoInfoStruct *VISvalue; + PlugInfoStruct *PISvalue; + char *svalue; + } plugMainUnion; -typedef plugMainUnion plugMainType(DWORD, LPVOID, DWORD); + typedef plugMainUnion plugMainType(DWORD, LPVOID, DWORD); /* * Function prototypes @@ -204,20 +204,20 @@ #ifdef _WIN32 -BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, DWORD lpReserved ); + BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, DWORD lpReserved ); -__declspec(dllexport) LPVOID __stdcall plugMain(DWORD functionCode, LPVOID pParam, DWORD reserved); + __declspec(dllexport) LPVOID __stdcall plugMain(DWORD functionCode, LPVOID pParam, DWORD reserved); -typedef __declspec(dllimport) LPVOID (__stdcall *FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); + typedef __declspec(dllimport) LPVOID (__stdcall *FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); #elif __linux__ -plugMainUnion plugMain(DWORD functionCode, LPVOID pParam, DWORD reserved); + plugMainUnion plugMain(DWORD functionCode, LPVOID pParam, DWORD reserved); #elif __APPLE__ -typedef LPVOID (*FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); + typedef LPVOID (*FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); #endif Modified: trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c 2008-05-24 00:05:54 UTC (rev 9883) +++ trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c 2008-05-24 00:07:14 UTC (rev 9884) @@ -92,7 +92,7 @@ { x->x_filename_count = scandir(plugindir, &x->x_filename_list, selector, alphasort); if (x->x_filename_count < 0) - x->x_filename_count = 0; + x->x_filename_count = 0; } void ff_loadplugins(t_pdp_freeframe *x, t_symbol *plugindirsymbol) @@ -111,7 +111,7 @@ x->plugins = (PLUGIN *)getbytes(x->x_filename_count*sizeof(PLUGIN)); if (x->plugins == NULL) { - panic("no memory for loading plugins\n"); + panic("no memory for loading plugins\n"); } else { @@ -120,51 +120,51 @@ for (i=0; i<x->x_filename_count; i++) { - pluginname = x->x_filename_list[i]->d_name; + pluginname = x->x_filename_list[i]->d_name; - snprintf(libname, PATH_MAX, "%s/%s", plugindir, pluginname); + snprintf(libname, PATH_MAX, "%s/%s", plugindir, pluginname); - plugin_handle = dlopen(libname, RTLD_NOW); - dlerror(); - plugmain = (plugMainType *)(unsigned)dlsym(plugin_handle, "plugMain"); - if (plugmain == NULL) - panic("plugin %s: %s", x->x_filename_list[i]->d_name, dlerror()); + plugin_handle = dlopen(libname, RTLD_NOW); + dlerror(); + plugmain = (plugMainType *)(unsigned)dlsym(plugin_handle, "plugMain"); + if (plugmain == NULL) + panic("plugin %s: %s", x->x_filename_list[i]->d_name, dlerror()); - PlugInfoStruct *pis = (plugmain(FF_GETINFO, NULL, 0)).PISvalue; + PlugInfoStruct *pis = (plugmain(FF_GETINFO, NULL, 0)).PISvalue; - if ((plugmain(FF_GETPLUGINCAPS, (LPVOID)FF_CAP_V_BITS_VIDEO, 0)).ivalue != FF_TRUE) - panic("plugin %s: no 24 bit support", pluginname); + if ((plugmain(FF_GETPLUGINCAPS, (LPVOID)FF_CAP_V_BITS_VIDEO, 0)).ivalue != FF_TRUE) + panic("plugin %s: no 24 bit support", pluginname); - if (pis->APIMajorVersion < 1) - panic("plugin %s: old api version", pluginname); + if (pis->APIMajorVersion < 1) + panic("plugin %s: old api version", pluginname); - if ((plugmain(FF_INITIALISE, NULL, 0)).ivalue == FF_FAIL) - panic("plugin %s: init failed", pluginname); + if ((plugmain(FF_INITIALISE, NULL, 0)).ivalue == FF_FAIL) + panic("plugin %s: init failed", pluginname); - VideoInfoStruct vidinfo; - vidinfo.frameWidth = x->x_width; - vidinfo.frameHeight = x->x_height; - vidinfo.orientation = 1; - vidinfo.bitDepth = FF_CAP_V_BITS_VIDEO; + VideoInfoStruct vidinfo; + vidinfo.frameWidth = x->x_width; + vidinfo.frameHeight = x->x_height; + vidinfo.orientation = 1; + vidinfo.bitDepth = FF_CAP_V_BITS_VIDEO; - instance = plugmain(FF_INSTANTIATE, &vidinfo, 0).ivalue; - if (instance == FF_FAIL) - panic("plugin %s: init failed", pluginname); + instance = plugmain(FF_INSTANTIATE, &vidinfo, 0).ivalue; + if (instance == FF_FAIL) + panic("plugin %s: init failed", pluginname); - numparameters = plugmain(FF_GETNUMPARAMETERS, NULL, 0).ivalue; - if (numparameters == FF_FAIL) - panic("plugin %s: numparameters failed", pluginname); + numparameters = plugmain(FF_GETNUMPARAMETERS, NULL, 0).ivalue; + if (numparameters == FF_FAIL) + panic("plugin %s: numparameters failed", pluginname); - x->plugins[x->x_plugin_count].plugmain = plugmain; + x->plugins[x->x_plugin_count].plugmain = plugmain; - strncpy(x->plugins[x->x_plugin_count].name, (char *)(pis->pluginName), 16); - x->plugins[x->x_plugin_count].name[16] = 0; + strncpy(x->plugins[x->x_plugin_count].name, (char *)(pis->pluginName), 16); + x->plugins[x->x_plugin_count].name[16] = 0; - x->plugins[x->x_plugin_count].instance = instance; - x->plugins[x->x_plugin_count].numparameters = numparameters; + x->plugins[x->x_plugin_count].instance = instance; + x->plugins[x->x_plugin_count].numparameters = numparameters; - post("%s [%s] is loaded", x->plugins[x->x_plugin_count].name, pluginname); - x->x_plugin_count++; + post("%s [%s] is loaded", x->plugins[x->x_plugin_count].name, pluginname); + x->x_plugin_count++; } } @@ -175,14 +175,14 @@ void ff_freeplugins(t_pdp_freeframe *x) { - t_int i; + t_int i; for (i=0; i<x->x_plugin_count; i++) { - plugMainType *plugmain = x->plugins[i].plugmain; + plugMainType *plugmain = x->plugins[i].plugmain; - plugmain(FF_DEINITIALISE, NULL, 0); - plugmain(FF_DEINSTANTIATE, NULL, x->plugins[i].instance); + plugmain(FF_DEINITIALISE, NULL, 0); + plugmain(FF_DEINSTANTIATE, NULL, x->plugins[i].instance); } post("freeing plugin resources : %x", x->plugins); freebytes( x->plugins, x->x_filename_count*sizeof(PLUGIN) ); @@ -203,9 +203,9 @@ short int *newdata = (short int *)pdp_packet_data(x->x_packet1); if ( x->x_plugin_count <= 0 ) - { - return; - } + { + return; + } if ((x->x_width != (t_int)header->info.image.width) || (x->x_height != (t_int)header->info.image.height)) @@ -236,7 +236,7 @@ static void pdp_freeframe_param(t_pdp_freeframe *x, t_floatarg f1, t_floatarg f2) { - int i=0; + int i=0; plugMainType *plugmain = x->plugins[x->x_plugin].plugmain; unsigned instance = x->plugins[x->x_plugin].instance; unsigned numparameters = x->plugins[x->x_plugin].numparameters; @@ -252,9 +252,9 @@ //post ("%d param.value %d", i, sps.value); - //if((f2<=1)&&(f2>=0)) - sps.value = f2; - //sps.value += .01; + //if((f2<=1)&&(f2>=0)) + sps.value = f2; + //sps.value += .01; //if (sps.value > 1.0) sps.value = 1.0; //else //if (sps.value < 0.0) sps.value = 0.0; @@ -266,51 +266,51 @@ static void pdp_freeframe_plugin(t_pdp_freeframe *x, t_floatarg f) { - unsigned pi; - char *parname; - int partype; - float pardefault; - t_atom plist[2]; - t_atom tlist[2]; - t_atom vlist[2]; + unsigned pi; + char *parname; + int partype; + float pardefault; + t_atom plist[2]; + t_atom tlist[2]; + t_atom vlist[2]; if ( x->x_plugin_count <= 0 ) { - post( "freeframe : no plugins loaded, check your plugin directory setup" ); - return; + post( "freeframe : no plugins loaded, check your plugin directory setup" ); + return; } if((f<x->x_plugin_count)&&(f>-1)) { - x->x_plugin = f; + x->x_plugin = f; } else { - post( "freeframe : plugin out of range : %d", (t_int)f ); - return; + post( "freeframe : plugin out of range : %d", (t_int)f ); + return; } post ("pdp_freeframe :: %s selected, %d parameters", x->plugins[x->x_plugin].name, x->plugins[x->x_plugin].numparameters); outlet_symbol(x->x_pname, gensym( x->plugins[x->x_plugin].name ) ); outlet_float(x->x_nparams, (float)x->plugins[x->x_plugin].numparameters); for ( pi=0; pi<x->plugins[x->x_plugin].numparameters; pi++ ) { - parname = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERNAME, (LPVOID)pi, 0)).svalue; - SETFLOAT(&plist[0], pi); - SETSYMBOL(&plist[1], gensym(parname) ); - outlet_list( x->x_parname, &s_list, 2, &plist[0] ); + parname = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERNAME, (LPVOID)pi, 0)).svalue; + SETFLOAT(&plist[0], pi); + SETSYMBOL(&plist[1], gensym(parname) ); + outlet_list( x->x_parname, &s_list, 2, &plist[0] ); } for ( pi=0; pi<x->plugins[x->x_plugin].numparameters; pi++ ) { - partype = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERTYPE, (LPVOID)pi, 0)).ivalue; - SETFLOAT(&tlist[0], pi); - SETFLOAT(&tlist[1], partype ); - outlet_list( x->x_partype, &s_list, 2, &tlist[0] ); - if ( ( partype != FF_TYPE_TEXT ) && ( partype > 0 ) ) - { - pardefault = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERDEFAULT, (LPVOID)pi, 0)).fvalue; - SETFLOAT(&vlist[0], pi); - SETFLOAT(&vlist[1], pardefault ); - outlet_list( x->x_pardefault, &s_list, 2, &vlist[0] ); - } + partype = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERTYPE, (LPVOID)pi, 0)).ivalue; + SETFLOAT(&tlist[0], pi); + SETFLOAT(&tlist[1], partype ); + outlet_list( x->x_partype, &s_list, 2, &tlist[0] ); + if ( ( partype != FF_TYPE_TEXT ) && ( partype > 0 ) ) + { + pardefault = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERDEFAULT, (LPVOID)pi, 0)).fvalue; + SETFLOAT(&vlist[0], pi); + SETFLOAT(&vlist[1], pardefault ); + outlet_list( x->x_pardefault, &s_list, 2, &vlist[0] ); + } } } @@ -326,62 +326,62 @@ static void pdp_freeframe_process(t_pdp_freeframe *x) { - int encoding; - t_pdp *header = 0; - char *parname; - unsigned pi; - int partype; - float pardefault; - t_atom plist[2]; - t_atom tlist[2]; - t_atom vlist[2]; + int encoding; + t_pdp *header = 0; + char *parname; + unsigned pi; + int partype; + float pardefault; + t_atom plist[2]; + t_atom tlist[2]; + t_atom vlist[2]; - /* check if image data packets are compatible */ - if ( (header = pdp_packet_header(x->x_packet0)) - && (PDP_BITMAP == header->type)){ + /* check if image data packets are compatible */ + if ( (header = pdp_packet_header(x->x_packet0)) + && (PDP_BITMAP == header->type)){ - /* pdp_freeframe_process inputs and write into active inlet */ - switch(pdp_packet_header(x->x_packet0)->info.image.encoding){ + /* pdp_freeframe_process inputs and write into active inlet */ + switch(pdp_packet_header(x->x_packet0)->info.image.encoding){ - case PDP_BITMAP_RGB: + case PDP_BITMAP_RGB: x->x_packet1 = pdp_packet_clone_rw(x->x_packet0); pdp_queue_add(x, pdp_freeframe_process_rgb, pdp_freeframe_sendpacket, &x->x_queue_id); - break; + break; - default: - /* don't know the type, so dont pdp_freeframe_process */ - break; + default: + /* don't know the type, so dont pdp_freeframe_process */ + break; - } + } } // hack to display infos of first loaded plugin if ( (x->x_plugin_count > 0) && (!x->x_infosok) ) { - x->x_infosok = 1; - outlet_symbol(x->x_pname, gensym( x->plugins[x->x_plugin].name ) ); - outlet_float(x->x_nparams, (float)x->plugins[x->x_plugin].numparameters); - for ( pi=0; pi<x->plugins[x->x_plugin].numparameters; pi++ ) - { - parname = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERNAME, (LPVOID)pi, 0)).svalue; - SETFLOAT(&plist[0], pi); - SETSYMBOL(&plist[1], gensym(parname) ); - outlet_list( x->x_parname, &s_list, 2, &plist[0] ); - } - for ( pi=0; pi<x->plugins[x->x_plugin].numparameters; pi++ ) - { - partype = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERTYPE, (LPVOID)pi, 0)).ivalue; - SETFLOAT(&tlist[0], pi); - SETFLOAT(&tlist[1], partype ); - outlet_list( x->x_partype, &s_list, 2, &tlist[0] ); - if ( ( partype != FF_TYPE_TEXT ) && ( partype > 0 ) ) - { - pardefault = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERDEFAULT, (LPVOID)pi, 0)).fvalue; - SETFLOAT(&vlist[0], pi); - SETFLOAT(&vlist[1], pardefault ); - outlet_list( x->x_pardefault, &s_list, 2, &vlist[0] ); - } - } + x->x_infosok = 1; + outlet_symbol(x->x_pname, gensym( x->plugins[x->x_plugin].name ) ); + outlet_float(x->x_nparams, (float)x->plugins[x->x_plugin].numparameters); + for ( pi=0; pi<x->plugins[x->x_plugin].numparameters; pi++ ) + { + parname = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERNAME, (LPVOID)pi, 0)).svalue; + SETFLOAT(&plist[0], pi); + SETSYMBOL(&plist[1], gensym(parname) ); + outlet_list( x->x_parname, &s_list, 2, &plist[0] ); + } + for ( pi=0; pi<x->plugins[x->x_plugin].numparameters; pi++ ) + { + partype = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERTYPE, (LPVOID)pi, 0)).ivalue; + SETFLOAT(&tlist[0], pi); + SETFLOAT(&tlist[1], partype ); + outlet_list( x->x_partype, &s_list, 2, &tlist[0] ); + if ( ( partype != FF_TYPE_TEXT ) && ( partype > 0 ) ) + { + pardefault = (x->plugins[x->x_plugin].plugmain(FF_GETPARAMETERDEFAULT, (LPVOID)pi, 0)).fvalue; + SETFLOAT(&vlist[0], pi); + SETFLOAT(&vlist[1], pardefault ); + outlet_list( x->x_pardefault, &s_list, 2, &vlist[0] ); + } + } } } @@ -390,7 +390,7 @@ /* if this is a register_ro message or register_rw message, register with packet factory */ if (s == gensym("register_rw")) - x->x_dropped = pdp_packet_convert_ro_or_drop(&x->x_packet0, (int)f, pdp_gensym("bitmap/rgb/*") ); + x->x_dropped = pdp_packet_convert_ro_or_drop(&x->x_packet0, (int)f, pdp_gensym("bitmap/rgb/*") ); if ((s == gensym("process")) && (-1 != x->x_packet0) && (!x->x_dropped)) { @@ -401,7 +401,7 @@ static void pdp_freeframe_free(t_pdp_freeframe *x) { - int i; + int i; pdp_queue_finish(x->x_queue_id); pdp_packet_mark_unused(x->x_packet0); @@ -462,20 +462,20 @@ #endif -void pdp_freeframe_setup(void) -{ + void pdp_freeframe_setup(void) + { - post( "pdp_freeframe :: FreeFrame host for Pure Data Packet version 0.3\n by Lluis Gomez i Bigorda (lluis(a)artefacte.org) \n & Yves Degoyon (ydegoyon(a)free.fr)\n using GPL code from http://freeframe.sf.net\n and Pete Warden http://petewarden.com" ); - pdp_freeframe_class = class_new(gensym("pdp_freeframe"), (t_newmethod)pdp_freeframe_new, - (t_method)pdp_freeframe_free, sizeof(t_pdp_freeframe), 0, A_DEFFLOAT, A_NULL); + post( "pdp_freeframe :: FreeFrame host for Pure Data Packet version 0.3\n by Lluis Gomez i Bigorda (lluis(a)artefacte.org) \n & Yves Degoyon (ydegoyon(a)free.fr)\n using GPL code from http://freeframe.sf.net\n and Pete Warden http://petewarden.com" ); + pdp_freeframe_class = class_new(gensym("pdp_freeframe"), (t_newmethod)pdp_freeframe_new, + (t_method)pdp_freeframe_free, sizeof(t_pdp_freeframe), 0, A_DEFFLOAT, A_NULL); - class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); - class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugin, gensym("plugin"), A_FLOAT, A_NULL); - class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_param, gensym("param"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugindir, gensym("plugindir"), A_SYMBOL, A_NULL); + class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); + class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugin, gensym("plugin"), A_FLOAT, A_NULL); + class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_param, gensym("param"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugindir, gensym("plugindir"), A_SYMBOL, A_NULL); -} + } #ifdef __cplusplus } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9883] trunk/externals/pdvjtools/pdp_freeframe
by eighthave＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9883 http://pure-data.svn.sourceforge.net/pure-data/?rev=9883&view=rev Author: eighthave Date: 2008-05-23 17:05:54 -0700 (Fri, 23 May 2008) Log Message: ----------- store plugindir as symbol in object's struct and use that with [plugindir( message; ported to Mac OS X Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c Modified: trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h 2008-05-23 23:47:25 UTC (rev 9882) +++ trunk/externals/pdvjtools/pdp_freeframe/FreeFrame.h 2008-05-24 00:05:54 UTC (rev 9883) @@ -51,7 +51,7 @@ * includes */ -#ifdef WIN32 +#ifdef _WIN32 #if _MSC_VER > 1000 #pragma once @@ -60,17 +60,12 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> -#elif defined LINUX +#elif defined(__linux__) || defined(__APPLE__) typedef unsigned int DWORD; typedef void *LPVOID; typedef unsigned char BYTE; -#elif defined MACOS - -typedef unsigned int DWORD; -typedef unsigned char BYTE; - #endif @@ -207,7 +202,7 @@ * */ -#ifdef WIN32 +#ifdef _WIN32 BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, DWORD lpReserved ); @@ -215,12 +210,12 @@ typedef __declspec(dllimport) LPVOID (__stdcall *FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); -#elif LINUX +#elif __linux__ plugMainUnion plugMain(DWORD functionCode, LPVOID pParam, DWORD reserved); -#elif MACOS +#elif __APPLE__ typedef LPVOID (*FF_Main_FuncPtr)(DWORD, LPVOID, DWORD); Modified: trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c 2008-05-23 23:47:25 UTC (rev 9882) +++ trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c 2008-05-24 00:05:54 UTC (rev 9883) @@ -70,6 +70,7 @@ int x_plugin; int x_infosok; char x_pdetails[FREEFRAME_PARAM_DETAILS_LENGTH]; + t_symbol *plugindir; PLUGIN *plugins; @@ -188,6 +189,12 @@ x->plugins = NULL; } +static void pdp_freeframe_plugindir(t_pdp_freeframe *x, t_symbol *s) +{ + x->plugindir = s; + ff_loadplugins(x, x->plugindir); +} + static void pdp_freeframe_process_rgb(t_pdp_freeframe *x) { t_pdp *header = pdp_packet_header(x->x_packet0); @@ -213,7 +220,7 @@ x->x_size = x->x_width*x->x_height; //load the plugins - ff_loadplugins(x, FF_PLUGIN_DIR); + ff_loadplugins(x, x->plugindir); } newheader->info.image.encoding = header->info.image.encoding; @@ -429,8 +436,20 @@ //load the plugins x->x_plugin_count = 0; x->x_infosok = 0; - //ff_loadplugins(x, FF_PLUGIN_DIR); + char ff_plugin_dir[FILENAME_MAX]; + char *home = getenv("HOME"); + int home_len; + if(home != NULL) + { + home_len = strlen(home); + if(home_len >= FILENAME_MAX) + home_len = FILENAME_MAX - 1; + memcpy(ff_plugin_dir, home, home_len); + ff_plugin_dir[home_len] = '\0'; + strncpy(ff_plugin_dir, "/.frf", FILENAME_MAX - home_len); + pdp_freeframe_plugindir(x, gensym(ff_plugin_dir)); + } pdp_freeframe_plugin(x, f); return (void *)x; @@ -453,7 +472,7 @@ class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugin, gensym("plugin"), A_FLOAT, A_NULL); class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_param, gensym("param"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(pdp_freeframe_class, (t_method)ff_loadplugins, gensym("plugindir"), A_SYMBOL, A_NULL); + class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugindir, gensym("plugindir"), A_SYMBOL, A_NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9882] trunk/externals/pdvjtools/pdp_freeframe/ pdp_freeframe.c
by lluisbigorda＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9882 http://pure-data.svn.sourceforge.net/pure-data/?rev=9882&view=rev Author: lluisbigorda Date: 2008-05-23 16:47:25 -0700 (Fri, 23 May 2008) Log Message: ----------- added a message to load the plugins Modified Paths: -------------- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c Modified: trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c 2008-05-23 23:06:32 UTC (rev 9881) +++ trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe.c 2008-05-23 23:47:25 UTC (rev 9882) @@ -94,8 +94,9 @@ x->x_filename_count = 0; } -void ff_loadplugins(t_pdp_freeframe *x, char *plugindir) +void ff_loadplugins(t_pdp_freeframe *x, t_symbol *plugindirsymbol) { + char* plugindir = plugindirsymbol->s_name; char libname[PATH_MAX]; plugMainType *plugmain; unsigned instance, numparameters; @@ -428,7 +429,7 @@ //load the plugins x->x_plugin_count = 0; x->x_infosok = 0; - ff_loadplugins(x, FF_PLUGIN_DIR); + //ff_loadplugins(x, FF_PLUGIN_DIR); pdp_freeframe_plugin(x, f); @@ -452,6 +453,7 @@ class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_input_0, gensym("pdp"), A_SYMBOL, A_DEFFLOAT, A_NULL); class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_plugin, gensym("plugin"), A_FLOAT, A_NULL); class_addmethod(pdp_freeframe_class, (t_method)pdp_freeframe_param, gensym("param"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(pdp_freeframe_class, (t_method)ff_loadplugins, gensym("plugindir"), A_SYMBOL, A_NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9881] trunk/externals/pdvjtools/pdp_freeframe
by eighthave＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9881 http://pure-data.svn.sourceforge.net/pure-data/?rev=9881&view=rev Author: eighthave Date: 2008-05-23 16:06:32 -0700 (Fri, 23 May 2008) Log Message: ----------- renamed help file to standard name Added Paths: ----------- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd Removed Paths: ------------- trunk/externals/pdvjtools/pdp_freeframe/help_pdp_freeframe.pd Deleted: trunk/externals/pdvjtools/pdp_freeframe/help_pdp_freeframe.pd =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/help_pdp_freeframe.pd 2008-05-23 22:56:53 UTC (rev 9880) +++ trunk/externals/pdvjtools/pdp_freeframe/help_pdp_freeframe.pd 2008-05-23 23:06:32 UTC (rev 9881) @@ -1,206 +0,0 @@ -#N canvas 0 0 996 665 10; -#X obj 43 335 pdp_freeframe; -#X floatatom 149 338 5 0 0 0 - - -; -#X obj 46 115 pdp_qt; -#X obj 46 45 metro 40; -#X msg 46 -17 bang; -#X msg 107 45 loop 1; -#X obj 41 507 pdp_xv; -#X obj 46 247 pdp_scale 320 240; -#X obj 194 336 hradio 15 1 0 44 empty empty empty 0 -6 0 8 -262144 --1 -1 0; -#X obj 261 171 hsl 128 15 0 1 0 0 empty vparam3 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X obj 401 171 hsl 128 15 0 1 0 0 empty vparam4 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X obj 541 171 hsl 128 15 0 1 0 0 empty vparam5 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X msg 258 191 param 3 \$1; -#X msg 398 190 param 4 \$1; -#X msg 539 190 param 5 \$1; -#X text 195 317 Select the plugin; -#X text 258 72 Adjust plugin parameters.; -#X msg 164 45 open \$1; -#X obj 164 23 openpanel; -#X text 95 -17 Load a mov file; -#X symbolatom 96 488 20 0 0 0 - - -; -#X text 249 488 <-- plugin name; -#X floatatom 115 466 5 0 0 0 - - -; -#X text 163 464 <-- number of parameters; -#X obj 46 176 pdp_spigot; -#X obj 119 148 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 -1; -#X obj 89 215 pdp_scale 192 168; -#X obj 241 47 pdp_v4l; -#X obj 241 20 metro 40; -#X msg 241 -8 bang; -#X text 214 438 <-- parameter name; -#X text 241 410 <-- parameter type; -#X text 257 381 <-- parameter default; -#X obj 263 112 hsl 128 15 0 1 0 0 empty vparam0 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X obj 401 112 hsl 128 15 0 1 0 0 empty vparam1 empty -2 -6 0 8 -262144 --1 -1 2391 1; -#X obj 542 112 hsl 128 15 0 1 0 0 empty vparam2 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X obj 261 234 hsl 128 15 0 1 0 0 empty vparam6 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X obj 402 234 hsl 128 15 0 1 0 0 empty vparam7 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X obj 544 234 hsl 128 15 0 1 0 0 empty vparam8 empty -2 -6 0 8 -262144 --1 -1 0 1; -#X msg 260 131 param 0 \$1; -#X msg 398 131 param 1 \$1; -#X msg 539 131 param 2 \$1; -#X msg 260 254 param 6 \$1; -#X msg 399 253 param 7 \$1; -#X msg 541 253 param 8 \$1; -#N canvas 0 0 996 665 pname 0; -#X obj 51 119 l2s; -#X obj 80 119 l2s; -#X obj 111 119 l2s; -#X obj 143 119 l2s; -#X obj 207 120 l2s; -#X obj 236 120 l2s; -#X obj 267 120 l2s; -#X obj 298 119 l2s; -#X obj 97 86 route 0 1 2 3 4 5 6 7 8; -#X obj 327 119 l2s; -#X obj 97 51 inlet; -#X obj 51 154 s ffparam0; -#X obj 79 178 s ffparam1; -#X obj 118 205 s ffparam2; -#X obj 148 227 s ffparam3; -#X obj 185 157 s ffparam4; -#X obj 213 181 s ffparam5; -#X obj 255 206 s ffparam6; -#X obj 283 230 s ffparam7; -#X obj 305 155 s ffparam8; -#X obj 391 53 inlet; -#X msg 390 79 symbol; -#X connect 0 0 11 0; -#X connect 1 0 12 0; -#X connect 2 0 13 0; -#X connect 3 0 14 0; -#X connect 4 0 15 0; -#X connect 5 0 16 0; -#X connect 6 0 17 0; -#X connect 7 0 18 0; -#X connect 8 0 0 0; -#X connect 8 1 1 0; -#X connect 8 2 2 0; -#X connect 8 3 3 0; -#X connect 8 4 4 0; -#X connect 8 5 5 0; -#X connect 8 6 6 0; -#X connect 8 7 7 0; -#X connect 8 8 9 0; -#X connect 9 0 19 0; -#X connect 10 0 8 0; -#X connect 20 0 21 0; -#X connect 21 0 11 0; -#X connect 21 0 12 0; -#X connect 21 0 13 0; -#X connect 21 0 14 0; -#X connect 21 0 15 0; -#X connect 21 0 16 0; -#X connect 21 0 17 0; -#X connect 21 0 18 0; -#X connect 21 0 19 0; -#X restore 146 438 pd pname; -#X symbolatom 260 93 18 0 0 0 - ffparam0 -; -#X symbolatom 399 92 18 0 0 0 - ffparam1 -; -#X symbolatom 538 92 18 0 0 0 - ffparam2 -; -#X symbolatom 261 154 18 0 0 0 - ffparam3 -; -#X symbolatom 400 153 18 0 0 0 - ffparam4 -; -#X symbolatom 539 153 18 0 0 0 - ffparam5 -; -#X symbolatom 261 214 18 0 0 0 - ffparam6 -; -#X symbolatom 400 213 18 0 0 0 - ffparam7 -; -#X symbolatom 539 213 18 0 0 0 - ffparam8 -; -#N canvas 0 0 996 665 default 0; -#X obj 97 86 route 0 1 2 3 4 5 6 7 8; -#X obj 97 51 inlet; -#X obj 391 53 inlet; -#X obj 51 154 s vparam0; -#X obj 393 114 float 0; -#X msg 392 88 bang; -#X obj 79 178 s vparam1; -#X obj 118 205 s vparam2; -#X obj 148 227 s vparam3; -#X obj 184 159 s vparam4; -#X obj 213 181 s vparam5; -#X obj 255 206 s vparam6; -#X obj 283 230 s vparam7; -#X obj 304 155 s vparam8; -#X connect 0 0 3 0; -#X connect 0 1 6 0; -#X connect 0 2 7 0; -#X connect 0 3 8 0; -#X connect 0 4 9 0; -#X connect 0 5 10 0; -#X connect 0 6 11 0; -#X connect 0 7 12 0; -#X connect 0 8 13 0; -#X connect 1 0 0 0; -#X connect 2 0 5 0; -#X connect 4 0 3 0; -#X connect 4 0 6 0; -#X connect 4 0 7 0; -#X connect 4 0 8 0; -#X connect 4 0 9 0; -#X connect 4 0 10 0; -#X connect 4 0 11 0; -#X connect 4 0 12 0; -#X connect 4 0 13 0; -#X connect 5 0 4 0; -#X restore 180 380 pd default; -#X text 487 440 FreeFrame host for Pure Data Packet version 0.3; -#X text 489 455 by Lluis Gomez i Bigorda (lluis(a)artefacte.org); -#X text 508 468 & Yves Degoyon (ydegoyon(a)free.fr); -#X text 489 483 using GPL code from http://freeframe.sf.net; -#X text 489 498 and Pete Warden http://petewarden.com; -#X obj 164 410 print type; -#X connect 0 0 6 0; -#X connect 0 1 20 0; -#X connect 0 2 22 0; -#X connect 0 3 45 0; -#X connect 0 4 61 0; -#X connect 0 5 55 0; -#X connect 1 0 0 1; -#X connect 2 0 24 0; -#X connect 3 0 2 0; -#X connect 4 0 3 0; -#X connect 4 0 5 0; -#X connect 4 0 18 0; -#X connect 5 0 2 0; -#X connect 7 0 0 0; -#X connect 8 0 1 0; -#X connect 9 0 12 0; -#X connect 10 0 13 0; -#X connect 11 0 14 0; -#X connect 12 0 0 0; -#X connect 13 0 0 0; -#X connect 14 0 0 0; -#X connect 17 0 2 0; -#X connect 18 0 17 0; -#X connect 22 0 45 1; -#X connect 22 0 55 1; -#X connect 24 0 7 0; -#X connect 24 1 26 0; -#X connect 25 0 24 1; -#X connect 26 0 0 0; -#X connect 27 0 24 0; -#X connect 28 0 27 0; -#X connect 29 0 28 0; -#X connect 33 0 39 0; -#X connect 34 0 40 0; -#X connect 35 0 41 0; -#X connect 36 0 42 0; -#X connect 37 0 43 0; -#X connect 38 0 44 0; -#X connect 39 0 0 0; -#X connect 40 0 0 0; -#X connect 41 0 0 0; -#X connect 42 0 0 0; -#X connect 43 0 0 0; -#X connect 44 0 0 0; Copied: trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd (from rev 9879, trunk/externals/pdvjtools/pdp_freeframe/help_pdp_freeframe.pd) =================================================================== --- trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd (rev 0) +++ trunk/externals/pdvjtools/pdp_freeframe/pdp_freeframe-help.pd 2008-05-23 23:06:32 UTC (rev 9881) @@ -0,0 +1,206 @@ +#N canvas 0 0 996 665 10; +#X obj 43 335 pdp_freeframe; +#X floatatom 149 338 5 0 0 0 - - -; +#X obj 46 115 pdp_qt; +#X obj 46 45 metro 40; +#X msg 46 -17 bang; +#X msg 107 45 loop 1; +#X obj 41 507 pdp_xv; +#X obj 46 247 pdp_scale 320 240; +#X obj 194 336 hradio 15 1 0 44 empty empty empty 0 -6 0 8 -262144 +-1 -1 0; +#X obj 261 171 hsl 128 15 0 1 0 0 empty vparam3 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X obj 401 171 hsl 128 15 0 1 0 0 empty vparam4 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X obj 541 171 hsl 128 15 0 1 0 0 empty vparam5 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X msg 258 191 param 3 \$1; +#X msg 398 190 param 4 \$1; +#X msg 539 190 param 5 \$1; +#X text 195 317 Select the plugin; +#X text 258 72 Adjust plugin parameters.; +#X msg 164 45 open \$1; +#X obj 164 23 openpanel; +#X text 95 -17 Load a mov file; +#X symbolatom 96 488 20 0 0 0 - - -; +#X text 249 488 <-- plugin name; +#X floatatom 115 466 5 0 0 0 - - -; +#X text 163 464 <-- number of parameters; +#X obj 46 176 pdp_spigot; +#X obj 119 148 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 +1; +#X obj 89 215 pdp_scale 192 168; +#X obj 241 47 pdp_v4l; +#X obj 241 20 metro 40; +#X msg 241 -8 bang; +#X text 214 438 <-- parameter name; +#X text 241 410 <-- parameter type; +#X text 257 381 <-- parameter default; +#X obj 263 112 hsl 128 15 0 1 0 0 empty vparam0 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X obj 401 112 hsl 128 15 0 1 0 0 empty vparam1 empty -2 -6 0 8 -262144 +-1 -1 2391 1; +#X obj 542 112 hsl 128 15 0 1 0 0 empty vparam2 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X obj 261 234 hsl 128 15 0 1 0 0 empty vparam6 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X obj 402 234 hsl 128 15 0 1 0 0 empty vparam7 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X obj 544 234 hsl 128 15 0 1 0 0 empty vparam8 empty -2 -6 0 8 -262144 +-1 -1 0 1; +#X msg 260 131 param 0 \$1; +#X msg 398 131 param 1 \$1; +#X msg 539 131 param 2 \$1; +#X msg 260 254 param 6 \$1; +#X msg 399 253 param 7 \$1; +#X msg 541 253 param 8 \$1; +#N canvas 0 0 996 665 pname 0; +#X obj 51 119 l2s; +#X obj 80 119 l2s; +#X obj 111 119 l2s; +#X obj 143 119 l2s; +#X obj 207 120 l2s; +#X obj 236 120 l2s; +#X obj 267 120 l2s; +#X obj 298 119 l2s; +#X obj 97 86 route 0 1 2 3 4 5 6 7 8; +#X obj 327 119 l2s; +#X obj 97 51 inlet; +#X obj 51 154 s ffparam0; +#X obj 79 178 s ffparam1; +#X obj 118 205 s ffparam2; +#X obj 148 227 s ffparam3; +#X obj 185 157 s ffparam4; +#X obj 213 181 s ffparam5; +#X obj 255 206 s ffparam6; +#X obj 283 230 s ffparam7; +#X obj 305 155 s ffparam8; +#X obj 391 53 inlet; +#X msg 390 79 symbol; +#X connect 0 0 11 0; +#X connect 1 0 12 0; +#X connect 2 0 13 0; +#X connect 3 0 14 0; +#X connect 4 0 15 0; +#X connect 5 0 16 0; +#X connect 6 0 17 0; +#X connect 7 0 18 0; +#X connect 8 0 0 0; +#X connect 8 1 1 0; +#X connect 8 2 2 0; +#X connect 8 3 3 0; +#X connect 8 4 4 0; +#X connect 8 5 5 0; +#X connect 8 6 6 0; +#X connect 8 7 7 0; +#X connect 8 8 9 0; +#X connect 9 0 19 0; +#X connect 10 0 8 0; +#X connect 20 0 21 0; +#X connect 21 0 11 0; +#X connect 21 0 12 0; +#X connect 21 0 13 0; +#X connect 21 0 14 0; +#X connect 21 0 15 0; +#X connect 21 0 16 0; +#X connect 21 0 17 0; +#X connect 21 0 18 0; +#X connect 21 0 19 0; +#X restore 146 438 pd pname; +#X symbolatom 260 93 18 0 0 0 - ffparam0 -; +#X symbolatom 399 92 18 0 0 0 - ffparam1 -; +#X symbolatom 538 92 18 0 0 0 - ffparam2 -; +#X symbolatom 261 154 18 0 0 0 - ffparam3 -; +#X symbolatom 400 153 18 0 0 0 - ffparam4 -; +#X symbolatom 539 153 18 0 0 0 - ffparam5 -; +#X symbolatom 261 214 18 0 0 0 - ffparam6 -; +#X symbolatom 400 213 18 0 0 0 - ffparam7 -; +#X symbolatom 539 213 18 0 0 0 - ffparam8 -; +#N canvas 0 0 996 665 default 0; +#X obj 97 86 route 0 1 2 3 4 5 6 7 8; +#X obj 97 51 inlet; +#X obj 391 53 inlet; +#X obj 51 154 s vparam0; +#X obj 393 114 float 0; +#X msg 392 88 bang; +#X obj 79 178 s vparam1; +#X obj 118 205 s vparam2; +#X obj 148 227 s vparam3; +#X obj 184 159 s vparam4; +#X obj 213 181 s vparam5; +#X obj 255 206 s vparam6; +#X obj 283 230 s vparam7; +#X obj 304 155 s vparam8; +#X connect 0 0 3 0; +#X connect 0 1 6 0; +#X connect 0 2 7 0; +#X connect 0 3 8 0; +#X connect 0 4 9 0; +#X connect 0 5 10 0; +#X connect 0 6 11 0; +#X connect 0 7 12 0; +#X connect 0 8 13 0; +#X connect 1 0 0 0; +#X connect 2 0 5 0; +#X connect 4 0 3 0; +#X connect 4 0 6 0; +#X connect 4 0 7 0; +#X connect 4 0 8 0; +#X connect 4 0 9 0; +#X connect 4 0 10 0; +#X connect 4 0 11 0; +#X connect 4 0 12 0; +#X connect 4 0 13 0; +#X connect 5 0 4 0; +#X restore 180 380 pd default; +#X text 487 440 FreeFrame host for Pure Data Packet version 0.3; +#X text 489 455 by Lluis Gomez i Bigorda (lluis(a)artefacte.org); +#X text 508 468 & Yves Degoyon (ydegoyon(a)free.fr); +#X text 489 483 using GPL code from http://freeframe.sf.net; +#X text 489 498 and Pete Warden http://petewarden.com; +#X obj 164 410 print type; +#X connect 0 0 6 0; +#X connect 0 1 20 0; +#X connect 0 2 22 0; +#X connect 0 3 45 0; +#X connect 0 4 61 0; +#X connect 0 5 55 0; +#X connect 1 0 0 1; +#X connect 2 0 24 0; +#X connect 3 0 2 0; +#X connect 4 0 3 0; +#X connect 4 0 5 0; +#X connect 4 0 18 0; +#X connect 5 0 2 0; +#X connect 7 0 0 0; +#X connect 8 0 1 0; +#X connect 9 0 12 0; +#X connect 10 0 13 0; +#X connect 11 0 14 0; +#X connect 12 0 0 0; +#X connect 13 0 0 0; +#X connect 14 0 0 0; +#X connect 17 0 2 0; +#X connect 18 0 17 0; +#X connect 22 0 45 1; +#X connect 22 0 55 1; +#X connect 24 0 7 0; +#X connect 24 1 26 0; +#X connect 25 0 24 1; +#X connect 26 0 0 0; +#X connect 27 0 24 0; +#X connect 28 0 27 0; +#X connect 29 0 28 0; +#X connect 33 0 39 0; +#X connect 34 0 40 0; +#X connect 35 0 41 0; +#X connect 36 0 42 0; +#X connect 37 0 43 0; +#X connect 38 0 44 0; +#X connect 39 0 0 0; +#X connect 40 0 0 0; +#X connect 41 0 0 0; +#X connect 42 0 0 0; +#X connect 43 0 0 0; +#X connect 44 0 0 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9880] trunk/externals/pdvjtools/colorgrid/Makefile
by lluisbigorda＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9880 http://pure-data.svn.sourceforge.net/pure-data/?rev=9880&view=rev Author: lluisbigorda Date: 2008-05-23 15:56:53 -0700 (Fri, 23 May 2008) Log Message: ----------- Modified Paths: -------------- trunk/externals/pdvjtools/colorgrid/Makefile Modified: trunk/externals/pdvjtools/colorgrid/Makefile =================================================================== --- trunk/externals/pdvjtools/colorgrid/Makefile 2008-05-23 22:47:53 UTC (rev 9879) +++ trunk/externals/pdvjtools/colorgrid/Makefile 2008-05-23 22:56:53 UTC (rev 9880) @@ -14,19 +14,18 @@ -Wall -W -Wno-shadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch #-Werror -LINUXINCLUDE = -I../../src -I/usr/src/pd-0.40-2/src +LINUXINCLUDE = -I../../../pd/src .c.pd_linux: cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux - rm -f $*.o ../$*.pd_linux - ln -s $*/$*.pd_linux .. + rm -f $*.o # ---------------------------------------------------------- install: - cp help-*.pd ../../doc/5.reference + cp help-*.pd ../../../doc/5.reference clean: rm -f *.o *.pd_* so_locations This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9879] trunk/externals/pdvjtools/imagegrid/imagegrid .c
by sergi_ll＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9879 http://pure-data.svn.sourceforge.net/pure-data/?rev=9879&view=rev Author: sergi_ll Date: 2008-05-23 15:47:53 -0700 (Fri, 23 May 2008) Log Message: ----------- change author info Modified Paths: -------------- trunk/externals/pdvjtools/imagegrid/imagegrid.c Modified: trunk/externals/pdvjtools/imagegrid/imagegrid.c =================================================================== --- trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-23 22:46:17 UTC (rev 9878) +++ trunk/externals/pdvjtools/imagegrid/imagegrid.c 2008-05-23 22:47:53 UTC (rev 9879) @@ -1,8 +1,7 @@ /* imagegrid external for Puredata -Copyright (C) 2007 Sergi Lario -sll :: slario-at-gmail.com +Sergi Lario :: slario-at-gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9878] trunk/externals/pdvjtools/videogrid/videogrid .cpp
by sergi_ll＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9878 http://pure-data.svn.sourceforge.net/pure-data/?rev=9878&view=rev Author: sergi_ll Date: 2008-05-23 15:46:17 -0700 (Fri, 23 May 2008) Log Message: ----------- change info about authors Modified Paths: -------------- trunk/externals/pdvjtools/videogrid/videogrid.cpp Modified: trunk/externals/pdvjtools/videogrid/videogrid.cpp =================================================================== --- trunk/externals/pdvjtools/videogrid/videogrid.cpp 2008-05-23 22:44:44 UTC (rev 9877) +++ trunk/externals/pdvjtools/videogrid/videogrid.cpp 2008-05-23 22:46:17 UTC (rev 9878) @@ -1,8 +1,8 @@ /* -videogrid external for Puredata -Copyright (C) 2007 Sergi Lario -sll :: slario-at-gmail.com +videogrid external for Puredatai +Lluis Gomez i Bigorda :: lluis-at-hangar.org +Sergi Lario Loyo :: slario-at-gmail.com This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9877] branches/pd-extended/v0-40/externals/creb/ modules++
by eighthave＠users.sourceforge.net 24 May '08

24 May '08

Revision: 9877 http://pure-data.svn.sourceforge.net/pure-data/?rev=9877&view=rev Author: eighthave Date: 2008-05-23 15:44:44 -0700 (Fri, 23 May 2008) Log Message: ----------- renamed files so that the filenames match the classnames Added Paths: ----------- branches/pd-extended/v0-40/externals/creb/modules++/biquadseries~.cc branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc branches/pd-extended/v0-40/externals/creb/modules++/filterortho~.cc Removed Paths: ------------- branches/pd-extended/v0-40/externals/creb/modules++/biquadseries.cc branches/pd-extended/v0-40/externals/creb/modules++/blosc.cc branches/pd-extended/v0-40/externals/creb/modules++/filterortho.cc Deleted: branches/pd-extended/v0-40/externals/creb/modules++/biquadseries.cc =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/biquadseries.cc 2008-05-23 22:40:19 UTC (rev 9876) +++ branches/pd-extended/v0-40/externals/creb/modules++/biquadseries.cc 2008-05-23 22:44:44 UTC (rev 9877) @@ -1,128 +0,0 @@ -/* - * biquadseries.cc - second order section filter pd interface - * Copyright (c) 2000-2003 by Tom Schouten - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -#include "m_pd.h" -#include <math.h> - -#include "DSPIcomplex.h" -#include "DSPIfilters.h" - - - -typedef struct biquadseries_struct -{ - t_object x_obj; - t_float x_f; - DSPIfilterSeries* biquadseries; -} t_biquadseries; - -void biquadseries_bang(t_biquadseries *x) -{ - -} - -void biquadseries_butterLP(t_biquadseries *x, t_floatarg f) -{ - x->biquadseries->setButterLP(f / sys_getsr()); -} - -void biquadseries_butterHP(t_biquadseries *x, t_floatarg f) -{ - x->biquadseries->setButterHP(f / sys_getsr()); -} - - - -static t_int *biquadseries_perform(t_int *w) -{ - - - t_float *in = (float *)(w[3]); - t_float *out = (float *)(w[4]); - DSPIfilterSeries* biquadseries = (DSPIfilterSeries *)(w[1]); - t_int n = (t_int)(w[2]); - t_int i; - t_float x; - - // dit kan beter - float smooth = .01; - //1.0f - pow(.9f,1.0f/(float)(n)); - - for (i = 0; i < n; i++) - { - x = *in++; - biquadseries->BangSmooth(x, x, smooth); - *out++ = x; - } - - return (w+5); -} - -static void biquadseries_dsp(t_biquadseries *x, t_signal **sp) -{ - dsp_add(biquadseries_perform, 4, x->biquadseries, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); - -} -void biquadseries_free(void) -{ - -} - -t_class *biquadseries_class; - -void *biquadseries_new(t_floatarg fsections) -{ - t_biquadseries *x = (t_biquadseries *)pd_new(biquadseries_class); - - int sections = (int)fsections; - if (sections < 1) sections = 1; - // post("biquadseries~: %d sections", sections); - x->biquadseries = new DSPIfilterSeries(sections); - - // inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("freq")); - outlet_new(&x->x_obj, gensym("signal")); - - biquadseries_butterLP(x, 10000); - - return (void *)x; -} - - -extern "C" { - -void biquadseries_tilde_setup(void) -{ - //post("biquadseries~ v0.1"); - - biquadseries_class = class_new(gensym("biquadseries~"), (t_newmethod)biquadseries_new, - (t_method)biquadseries_free, sizeof(t_biquadseries), 0, A_DEFFLOAT, 0); - - CLASS_MAINSIGNALIN(biquadseries_class, t_biquadseries, x_f); - - class_addmethod(biquadseries_class, (t_method)biquadseries_bang, gensym("bang"), (t_atomtype)0); - - class_addmethod(biquadseries_class, (t_method)biquadseries_dsp, gensym("dsp"), (t_atomtype)0); - - class_addmethod(biquadseries_class, (t_method)biquadseries_butterLP, gensym("butterLP"), A_FLOAT, A_NULL); - class_addmethod(biquadseries_class, (t_method)biquadseries_butterHP, gensym("butterHP"), A_FLOAT, A_NULL); - -} - -} Copied: branches/pd-extended/v0-40/externals/creb/modules++/biquadseries~.cc (from rev 9861, branches/pd-extended/v0-40/externals/creb/modules++/biquadseries.cc) =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/biquadseries~.cc (rev 0) +++ branches/pd-extended/v0-40/externals/creb/modules++/biquadseries~.cc 2008-05-23 22:44:44 UTC (rev 9877) @@ -0,0 +1,128 @@ +/* + * biquadseries.cc - second order section filter pd interface + * Copyright (c) 2000-2003 by Tom Schouten + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +#include "m_pd.h" +#include <math.h> + +#include "DSPIcomplex.h" +#include "DSPIfilters.h" + + + +typedef struct biquadseries_struct +{ + t_object x_obj; + t_float x_f; + DSPIfilterSeries* biquadseries; +} t_biquadseries; + +void biquadseries_bang(t_biquadseries *x) +{ + +} + +void biquadseries_butterLP(t_biquadseries *x, t_floatarg f) +{ + x->biquadseries->setButterLP(f / sys_getsr()); +} + +void biquadseries_butterHP(t_biquadseries *x, t_floatarg f) +{ + x->biquadseries->setButterHP(f / sys_getsr()); +} + + + +static t_int *biquadseries_perform(t_int *w) +{ + + + t_float *in = (float *)(w[3]); + t_float *out = (float *)(w[4]); + DSPIfilterSeries* biquadseries = (DSPIfilterSeries *)(w[1]); + t_int n = (t_int)(w[2]); + t_int i; + t_float x; + + // dit kan beter + float smooth = .01; + //1.0f - pow(.9f,1.0f/(float)(n)); + + for (i = 0; i < n; i++) + { + x = *in++; + biquadseries->BangSmooth(x, x, smooth); + *out++ = x; + } + + return (w+5); +} + +static void biquadseries_dsp(t_biquadseries *x, t_signal **sp) +{ + dsp_add(biquadseries_perform, 4, x->biquadseries, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); + +} +void biquadseries_free(void) +{ + +} + +t_class *biquadseries_class; + +void *biquadseries_new(t_floatarg fsections) +{ + t_biquadseries *x = (t_biquadseries *)pd_new(biquadseries_class); + + int sections = (int)fsections; + if (sections < 1) sections = 1; + // post("biquadseries~: %d sections", sections); + x->biquadseries = new DSPIfilterSeries(sections); + + // inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("freq")); + outlet_new(&x->x_obj, gensym("signal")); + + biquadseries_butterLP(x, 10000); + + return (void *)x; +} + + +extern "C" { + +void biquadseries_tilde_setup(void) +{ + //post("biquadseries~ v0.1"); + + biquadseries_class = class_new(gensym("biquadseries~"), (t_newmethod)biquadseries_new, + (t_method)biquadseries_free, sizeof(t_biquadseries), 0, A_DEFFLOAT, 0); + + CLASS_MAINSIGNALIN(biquadseries_class, t_biquadseries, x_f); + + class_addmethod(biquadseries_class, (t_method)biquadseries_bang, gensym("bang"), (t_atomtype)0); + + class_addmethod(biquadseries_class, (t_method)biquadseries_dsp, gensym("dsp"), (t_atomtype)0); + + class_addmethod(biquadseries_class, (t_method)biquadseries_butterLP, gensym("butterLP"), A_FLOAT, A_NULL); + class_addmethod(biquadseries_class, (t_method)biquadseries_butterHP, gensym("butterHP"), A_FLOAT, A_NULL); + +} + +} Deleted: branches/pd-extended/v0-40/externals/creb/modules++/blosc.cc =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/blosc.cc 2008-05-23 22:40:19 UTC (rev 9876) +++ branches/pd-extended/v0-40/externals/creb/modules++/blosc.cc 2008-05-23 22:44:44 UTC (rev 9877) @@ -1,782 +0,0 @@ -/* - * blosc.c - bandlimited oscillators - * using minimum phase impulse, step & ramp - * Copyright (c) 2000-2003 by Tom Schouten - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -#include "m_pd.h" -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - - -#include "DSPIcomplex.h" -#include "DSPIfilters.h" - -/* work around old bug in Apple compilers <hans(a)at.or.at> */ -//#if MAC_OS_X_VERSION < MAC_OS_X_VERSION_10_4 // arg, this didn't work -#ifndef isnan -extern "C" int isnan(double); -#endif -#ifndef isinf -extern "C" int isinf(double); -#endif - -typedef unsigned long long u64; -typedef unsigned long u32; - - - -#define LPHASOR (8*sizeof(u32)) // the phasor logsize -#define VOICES 8 // the number of waveform voices -#define LLENGTH 6 // the loglength of a fractional delayed basic waveform -#define LOVERSAMPLE 6 // the log of the oversampling factor (nb of fract delayed waveforms) -#define LPAD 1 // the log of the time padding factor (to reduce time aliasing) -#define LTABLE (LLENGTH+LOVERSAMPLE) -#define N (1<<LTABLE) -#define M (1<<(LTABLE+LPAD)) -#define S (1<<LOVERSAMPLE) -#define L (1<<LLENGTH) -#define LMASK (L-1) - -#define WALPHA 0.1f // windowing alpha (0 = cos -> 1 = rect) -#define CUTOFF 0.8f // fraction of nyquist for impulse cutoff -#define NBPERIODS ((float)(L) * CUTOFF / 2.0f) - -/* sample buffers */ -static float bli[N]; // band limited impulse -static float bls[N]; // band limited step -static float blr[N]; // band limited ramp - - -typedef struct bloscctl -{ - t_int c_index[VOICES]; // array of indices in sample table - t_float c_frac[VOICES]; // array of fractional indices - t_float c_vscale[VOICES]; // array of scale factors - t_int c_next_voice; // next voice to steal (round robin) - u32 c_phase; // phase of main oscillator - u32 c_phase2; // phase of secondairy oscillator - t_float c_state; // state of the square wave - t_float c_prev_amp; // previous input of comparator - t_float c_phase_inc_scale; - t_float c_scale; - t_float c_scale_update; - DSPIfilterSeries* c_butter; // the series filter - t_symbol *c_waveform; - -} t_bloscctl; - -typedef struct blosc -{ - t_object x_obj; - t_float x_f; - t_bloscctl x_ctl; -} t_blosc; - - -/* phase converters */ -static inline float _phase_to_float(u32 p){return ((float)p) * (1.0f / 4294967296.0f);} -static inline u32 _float_to_phase(float f){return ((u32)(f * 4294967296.0f)) & ~(S-1);} - - -/* flat table: better for linear interpolation */ -static inline float _play_voice_lint(float *table, t_int *index, float frac, float scale) -{ - t_int i = *index; - - /* perform linear interpolation */ - float f = (((1.0f - frac) * table[i]) + (table[i+1] * frac)) * scale; - - /* increment phase index if next 2 elements will still be inside table - if not there's no increment and the voice will keep playing the same sample */ - - i += (((i+S+1) >> LTABLE) ^ 1) << LOVERSAMPLE; - - *index = i; - return f; -} - -/* get one sample from the bandlimited discontinuity wavetable playback syth */ -static inline t_float _get_bandlimited_discontinuity(t_bloscctl *ctl, float *table) -{ - float sum = 0.0f; - int i; - /* sum all voices */ - for (i=0; i<VOICES; i++){ - sum += _play_voice_lint(table, ctl->c_index+i, ctl->c_frac[i], ctl->c_vscale[i]); - } - - return sum; -} - - -/* update waveplayers on zero cross */ -static void _bang_comparator(t_bloscctl *ctl, float prev, float curr) -{ - - /* check for sign change */ - if ((prev * curr) < 0.0f){ - - int voice; - - /* determine the location of the discontinuity (in oversampled coordiates - using linear interpolation */ - - float f = (float)S * curr / (curr - prev); - - /* get the offset in the oversample table */ - - u32 table_index = (u32)f; - - /* determine the fractional part (in oversampled coordinates) - for linear interpolation */ - - float table_frac_index = f - (float)table_index; - - /* set state (+ or -) */ - - ctl->c_state = (curr > 0.0f) ? 0.5f : -0.5f; - - /* steal the oldest voice */ - - voice = ctl->c_next_voice++; - ctl->c_next_voice &= VOICES-1; - - /* initialize the new voice index and interpolation fraction */ - - ctl->c_index[voice] = table_index; - ctl->c_frac[voice] = table_frac_index; - ctl->c_vscale[voice] = -ctl->c_scale * 2.0f * ctl->c_state; - - } - -} - - -/* advance phasor and update waveplayers on phase wrap */ -static void _bang_phasor(t_bloscctl *ctl, float freq) -{ - u32 phase = ctl->c_phase; - u32 phase_inc; - u32 oldphase; - int voice; - float scale = ctl->c_scale; - - /* get increment */ - float inc = freq * ctl->c_phase_inc_scale; - - /* calculate new phase - the increment (and the phase) should be a multiple of S */ - if (inc < 0.0f) inc = -inc; - phase_inc = ((u32)inc) & ~(S-1); - oldphase = phase; - phase += phase_inc; - - - /* check for phase wrap */ - if (phase < oldphase){ - u32 phase_inc_decimated = phase_inc >> LOVERSAMPLE; - u32 table_index; - u32 table_phase; - - /* steal the oldest voice if we have a phase wrap */ - - voice = ctl->c_next_voice++; - ctl->c_next_voice &= VOICES-1; - - /* determine the location of the discontinuity (in oversampled coordinates) - which is S * (new phase) / (increment) */ - - table_index = phase / phase_inc_decimated; - - /* determine the fractional part (in oversampled coordinates) - for linear interpolation */ - - table_phase = phase - (table_index * phase_inc_decimated); - - /* use it to initialize the new voice index and interpolation fraction */ - - ctl->c_index[voice] = table_index; - ctl->c_frac[voice] = (float)table_phase / (float)phase_inc_decimated; - ctl->c_vscale[voice] = scale; - scale = scale * ctl->c_scale_update; - - } - - /* save state */ - ctl->c_phase = phase; - ctl->c_scale = scale; -} - - -/* the 2 oscillator version: - the second osc can reset the first osc's phase (hence it determines the pitch) - the first osc determines the waveform */ - -static void _bang_hardsync_phasor(t_bloscctl *ctl, float freq, float freq2) -{ - u32 phase = ctl->c_phase; - u32 phase2 = ctl->c_phase2; - u32 phase_inc; - u32 phase_inc2; - u32 oldphase; - u32 oldphase2; - int voice; - float scale = ctl->c_scale; - - - /* get increment */ - float inc = freq * ctl->c_phase_inc_scale; - float inc2 = freq2 * ctl->c_phase_inc_scale; - - /* calculate new phases - the increment (and the phase) should be a multiple of S */ - - /* save previous phases */ - oldphase = phase; - oldphase2 = phase2; - - /* update second osc */ - if (inc2 < 0.0f) inc2 = -inc2; - phase_inc2 = ((u32)inc2) & ~(S-1); - phase2 += phase_inc2; - - /* update first osc (freq should be >= freq of sync osc */ - if (inc < 0.0f) inc = -inc; - phase_inc = ((u32)inc) & ~(S-1); - if (phase_inc < phase_inc2) phase_inc = phase_inc2; - phase += phase_inc; - - - /* check for sync discontinuity (osc 2) */ - if (phase2 < oldphase2) { - - /* adjust phase depending on the location of the discontinuity in phase2: - phase/phase_inc == phase2/phase_inc2 */ - - u64 pi = phase_inc >> LOVERSAMPLE; - u64 pi2 = phase_inc2 >> LOVERSAMPLE; - u64 lphase = ((u64)phase2 * pi) / pi2; - phase = lphase & ~(S-1); - } - - - /* check for phase discontinuity (osc 1) */ - if (phase < oldphase){ - u32 phase_inc_decimated = phase_inc >> LOVERSAMPLE; - u32 table_index; - u32 table_phase; - float stepsize; - - /* steal the oldest voice if we have a phase wrap */ - - voice = ctl->c_next_voice++; - ctl->c_next_voice &= VOICES-1; - - /* determine the location of the discontinuity (in oversampled coordinates) - which is S * (new phase) / (increment) */ - - table_index = phase / phase_inc_decimated; - - /* determine the fractional part (in oversampled coordinates) - for linear interpolation */ - - table_phase = phase - (table_index * phase_inc_decimated); - - /* determine the step size - as opposed to saw/impulse waveforms, the step is not always equal to one. it is: - oldphase - phase + phase_inc - but for the unit step this will overflow to zero, so we - reduce the bit depth to prevent overflow */ - - stepsize = _phase_to_float(((oldphase-phase) >> LOVERSAMPLE) - + phase_inc_decimated) * (float)S; - - /* use it to initialize the new voice index and interpolation fraction */ - - ctl->c_index[voice] = table_index; - ctl->c_frac[voice] = (float)table_phase / (float)phase_inc_decimated; - ctl->c_vscale[voice] = scale * stepsize; - scale = scale * ctl->c_scale_update; - - } - - /* save state */ - ctl->c_phase = phase; - ctl->c_phase2 = phase2; - ctl->c_scale = scale; -} - - -static t_int *blosc_perform_hardsync_saw(t_int *w) -{ - t_float *freq = (float *)(w[3]); - t_float *freq2 = (float *)(w[4]); - t_float *out = (float *)(w[5]); - t_bloscctl *ctl = (t_bloscctl *)(w[1]); - t_int n = (t_int)(w[2]); - t_int i; - - /* set postfilter cutoff */ - ctl->c_butter->setButterHP(0.85f * (*freq / sys_getsr())); - - while (n--) { - float frequency = *freq++; - float frequency2 = *freq2++; - - /* get the bandlimited discontinuity */ - float sample = _get_bandlimited_discontinuity(ctl, bls); - - /* add aliased sawtooth wave */ - sample += _phase_to_float(ctl->c_phase) - 0.5f; - - /* highpass filter output to remove DC offset and low frequency aliasing */ - ctl->c_butter->BangSmooth(sample, sample, 0.05f); - - /* send to output */ - *out++ = sample; - - /* advance phasor */ - _bang_hardsync_phasor(ctl, frequency2, frequency); - - } - - return (w+6); -} - -static t_int *blosc_perform_saw(t_int *w) -{ - t_float *freq = (float *)(w[3]); - t_float *out = (float *)(w[4]); - t_bloscctl *ctl = (t_bloscctl *)(w[1]); - t_int n = (t_int)(w[2]); - t_int i; - - while (n--) { - float frequency = *freq++; - - /* get the bandlimited discontinuity */ - float sample = _get_bandlimited_discontinuity(ctl, bls); - - /* add aliased sawtooth wave */ - sample += _phase_to_float(ctl->c_phase) - 0.5f; - - /* send to output */ - *out++ = sample; - - /* advance phasor */ - _bang_phasor(ctl, frequency); - - } - - return (w+5); -} - - - -static t_int *blosc_perform_pulse(t_int *w) -{ - t_float *freq = (float *)(w[3]); - t_float *out = (float *)(w[4]); - t_bloscctl *ctl = (t_bloscctl *)(w[1]); - t_int n = (t_int)(w[2]); - t_int i; - - - /* set postfilter cutoff */ - ctl->c_butter->setButterHP(0.85f * (*freq / sys_getsr())); - - while (n--) { - float frequency = *freq++; - - /* get the bandlimited discontinuity */ - float sample = _get_bandlimited_discontinuity(ctl, bli); - - /* highpass filter output to remove DC offset and low frequency aliasing */ - ctl->c_butter->BangSmooth(sample, sample, 0.05f); - - /* send to output */ - *out++ = sample; - - /* advance phasor */ - _bang_phasor(ctl, frequency); - - } - - return (w+5); -} - -static t_int *blosc_perform_comparator(t_int *w) -{ - t_float *amp = (float *)(w[3]); - t_float *out = (float *)(w[4]); - t_bloscctl *ctl = (t_bloscctl *)(w[1]); - t_int n = (t_int)(w[2]); - t_int i; - t_float prev_amp = ctl->c_prev_amp; - - while (n--) { - float curr_amp = *amp++; - - /* exact zero won't work for zero detection (sic) */ - if (curr_amp == 0.0f) curr_amp = 0.0000001f; - - /* get the bandlimited discontinuity */ - float sample = _get_bandlimited_discontinuity(ctl, bls); - - /* add the block wave state */ - sample += ctl->c_state; - - /* send to output */ - *out++ = sample; - - /* advance phasor */ - _bang_comparator(ctl, prev_amp, curr_amp); - - prev_amp = curr_amp; - - } - - ctl->c_prev_amp = prev_amp; - - return (w+5); -} - -static void blosc_phase(t_blosc *x, t_float f) -{ - x->x_ctl.c_phase = _float_to_phase(f); - x->x_ctl.c_phase2 = _float_to_phase(f); -} - -static void blosc_phase1(t_blosc *x, t_float f) -{ - x->x_ctl.c_phase = _float_to_phase(f); -} - -static void blosc_phase2(t_blosc *x, t_float f) -{ - x->x_ctl.c_phase2 = _float_to_phase(f); -} - -static void blosc_dsp(t_blosc *x, t_signal **sp) -{ - int n = sp[0]->s_n; - - /* set sampling rate scaling for phasors */ - x->x_ctl.c_phase_inc_scale = 4.0f * (float)(1<<(LPHASOR-2)) / sys_getsr(); - - - /* setup & register the correct process routine depending on the waveform */ - - /* 2 osc */ - if (x->x_ctl.c_waveform == gensym("syncsaw")){ - x->x_ctl.c_scale = 1.0f; - x->x_ctl.c_scale_update = 1.0f; - dsp_add(blosc_perform_hardsync_saw, 5, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec); - } - - /* 1 osc */ - else if (x->x_ctl.c_waveform == gensym("pulse")){ - x->x_ctl.c_scale = 1.0f; - x->x_ctl.c_scale_update = 1.0f; - dsp_add(blosc_perform_pulse, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); - } - else if (x->x_ctl.c_waveform == gensym("pulse2")){ - x->x_ctl.c_phase_inc_scale *= 2; - x->x_ctl.c_scale = 1.0f; - x->x_ctl.c_scale_update = -1.0f; - dsp_add(blosc_perform_pulse, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); - } - else if (x->x_ctl.c_waveform == gensym("comparator")){ - x->x_ctl.c_scale = 1.0f; - x->x_ctl.c_scale_update = 1.0f; - dsp_add(blosc_perform_comparator, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); - } - else{ - x->x_ctl.c_scale = 1.0f; - x->x_ctl.c_scale_update = 1.0f; - dsp_add(blosc_perform_saw, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); - } - - - -} -static void blosc_free(t_blosc *x) -{ - delete x->x_ctl.c_butter; -} - -t_class *blosc_class; - -static void *blosc_new(t_symbol *s) -{ - t_blosc *x = (t_blosc *)pd_new(blosc_class); - int i; - - /* out 1 */ - outlet_new(&x->x_obj, gensym("signal")); - - /* optional signal inlets */ - if (s == gensym("syncsaw")){ - inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); - } - - /* optional phase inlet */ - if (s != gensym("comparator")){ - inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("phase")); - } - - /* create the postfilter */ - x->x_ctl.c_butter = new DSPIfilterSeries(3); - - /* init oscillators */ - for (i=0; i<VOICES; i++) { - x->x_ctl.c_index[i] = N-2; - x->x_ctl.c_frac[i] = 0.0f; - } - - /* init rest of state data */ - blosc_phase(x, 0); - blosc_phase2(x, 0); - x->x_ctl.c_state = 0.0; - x->x_ctl.c_prev_amp = 0.0; - x->x_ctl.c_next_voice = 0; - x->x_ctl.c_scale = 1.0f; - x->x_ctl.c_scale_update = 1.0f; - x->x_ctl.c_waveform = s; - - return (void *)x; -} - - - - - - - -/* CLASS DATA INIT (tables) */ - - -/* some vector ops */ - -/* clear a buffer */ -static inline void _clear(float *array, int size) -{ - memset(array, 0, sizeof(float)*size); -} - -/* compute complex log */ -static inline void _clog(float *real, float *imag, int size) -{ - int k; - for (k=0; k<size; k++){ - float r = real[k]; - float i = imag[k]; - float radius = sqrt(r*r+i*i); - real[k] = log(radius); - imag[k] = atan2(i,r); - } -} - -/* compute complex exp */ -static inline void _cexp(float *real, float *imag, int size) -{ - int k; - for (k=0; k<size; k++){ - float r = exp(real[k]); - float i = imag[k]; - real[k] = r * cos(i); - imag[k] = r * sin(i); - } -} - - -/* compute fft */ -static inline void _fft(float *real, float *imag, int size) -{ - int i; - float scale = 1.0f / sqrt((float)size); - for (i=0; i<size; i++){ - real[i] *= scale; - imag[i] *= scale; - if (isnan(real[i])) post("fftpanic %d", i); - } - mayer_fft(size, real, imag); -} -/* compute ifft */ -static inline void _ifft(float *real, float *imag, int size) -{ - int i; - float scale = 1.0f / sqrt((float)size); - for (i=0; i<size; i++){ - real[i] *= scale; - imag[i] *= scale; - if (isnan(real[i])) post("ifftpanic %d", i); - } - mayer_ifft(size, real, imag); -} - -/* convert an integer index to a phase: [0 -> pi, -pi -> 0] */ -static inline float _i2theta(int i, int size){ - float p = 2.0f * M_PI * (float)i / (float)size; - if (p >= M_PI) p -= 2.0f * M_PI; - return p; -} - - -/* print matlab array */ -static void _printm(float *array, char *name, int size) -{ - int i; - fprintf(stderr, "%s = [", name); - for (i=0; i<size; i++){ - fprintf(stderr, "%f;", array[i]); - } - fprintf(stderr, "];\n"); -} - -/* store oversampled waveform as decimated chunks */ -static void _store_decimated(float *dst, float *src, float scale, int size) -{ - int i; - for (i=0; i<size; i++){ - int offset = (i % S) * L; - int index = i / S; - dst[offset+index] = scale * src[i]; - } - -} - -/* store waveform as one chunk */ -static void _store(float *dst, float *src, float scale, int size) -{ - int i; - for (i=0; i<size; i++){ - dst[i] = scale * src[i]; - } - -} - -/* create a minimum phase bandlimited impulse */ -static void build_tables(void) -{ - - /* table size = M>=N (time padding to reduce time aliasing) */ - - /* we work in the complex domain to eliminate the need to avoid - negative spectral components */ - - float real[M]; - float imag[M]; - float sum,scale; - int i,j; - - - /* create windowed sinc */ - _clear(imag, M); - real[0] = 1.0f; - for (i=1; i<M; i++){ - float tw = _i2theta(i,M); - float ts = tw * NBPERIODS * (float)(M) / (float)(N); - - /* sinc */ - real[i] = sin(ts)/ts; - - /* blackman window */ - real[i] *= 0.42f + 0.5f * (cos(tw)) + 0.08f * (cos(2.0f*tw)); - - //real[i] *= 0.5f * (1.0f + WALPHA) + 0.5f * (1.0f - WALPHA) * (cos(tw)); - - /* check for nan */ - if (isnan(real[i])) post("sinc NaN panic %d", i); - if (isinf(real[i])) post("sinc Inf panic %d", i); - - } - - - /* compute cepstrum */ - _fft(real, imag, M); - _clog(real, imag, M); - _ifft(real, imag, M); - - - /* kill anti-causal part (contribution of non minimum phase zeros) */ - /* should we kill nyquist too ?? */ - for (i=M/2+1; i<M; i++){ - real[i] *= 0.0000f; - imag[i] *= 0.0000f; - } - - - /* compute inverse cepstrum */ - _fft(real, imag, M); - _cexp(real, imag, M); - _ifft(real, imag, M); - - - - /* from here on, discard the padded part [N->M-1] - and work with the first N samples */ - - /* normalize impulse (integral = 1) */ - sum = 0.0f; - for (i=0; i<N; i++){sum += real[i];} - scale = 1.0f / sum; - for (i=0; i<N; i++){real[i] *= scale;} - - - /* store bli table */ - _store(bli, real, (float)S, N); - //_printm(bli, "h", N); - - - /* integrate impulse and invert to produce a step function - from 1->0 */ - sum = 0.0f; - for (i=0; i<N; i++){ - sum += real[i]; - real[i] = (1.0f - sum); - } - - /* store decimated bls tables */ - _store(bls, real, 1.0f, N); - - -} - -extern "C" -{ - void blosc_tilde_setup(void) - { - //post("blosc~ v0.1"); - - build_tables(); - - blosc_class = class_new(gensym("blosc~"), (t_newmethod)blosc_new, - (t_method)blosc_free, sizeof(t_blosc), 0, A_DEFSYMBOL, A_NULL); - CLASS_MAINSIGNALIN(blosc_class, t_blosc, x_f); - class_addmethod(blosc_class, (t_method)blosc_dsp, gensym("dsp"), A_NULL); - class_addmethod(blosc_class, (t_method)blosc_phase, gensym("phase"), A_FLOAT, A_NULL); - class_addmethod(blosc_class, (t_method)blosc_phase2, gensym("phase2"), A_FLOAT, A_NULL); - - - } - -} Copied: branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc (from rev 9861, branches/pd-extended/v0-40/externals/creb/modules++/blosc.cc) =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc (rev 0) +++ branches/pd-extended/v0-40/externals/creb/modules++/blosc~.cc 2008-05-23 22:44:44 UTC (rev 9877) @@ -0,0 +1,782 @@ +/* + * blosc.c - bandlimited oscillators + * using minimum phase impulse, step & ramp + * Copyright (c) 2000-2003 by Tom Schouten + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +#include "m_pd.h" +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + + +#include "DSPIcomplex.h" +#include "DSPIfilters.h" + +/* work around old bug in Apple compilers <hans(a)at.or.at> */ +//#if MAC_OS_X_VERSION < MAC_OS_X_VERSION_10_4 // arg, this didn't work +#ifndef isnan +extern "C" int isnan(double); +#endif +#ifndef isinf +extern "C" int isinf(double); +#endif + +typedef unsigned long long u64; +typedef unsigned long u32; + + + +#define LPHASOR (8*sizeof(u32)) // the phasor logsize +#define VOICES 8 // the number of waveform voices +#define LLENGTH 6 // the loglength of a fractional delayed basic waveform +#define LOVERSAMPLE 6 // the log of the oversampling factor (nb of fract delayed waveforms) +#define LPAD 1 // the log of the time padding factor (to reduce time aliasing) +#define LTABLE (LLENGTH+LOVERSAMPLE) +#define N (1<<LTABLE) +#define M (1<<(LTABLE+LPAD)) +#define S (1<<LOVERSAMPLE) +#define L (1<<LLENGTH) +#define LMASK (L-1) + +#define WALPHA 0.1f // windowing alpha (0 = cos -> 1 = rect) +#define CUTOFF 0.8f // fraction of nyquist for impulse cutoff +#define NBPERIODS ((float)(L) * CUTOFF / 2.0f) + +/* sample buffers */ +static float bli[N]; // band limited impulse +static float bls[N]; // band limited step +static float blr[N]; // band limited ramp + + +typedef struct bloscctl +{ + t_int c_index[VOICES]; // array of indices in sample table + t_float c_frac[VOICES]; // array of fractional indices + t_float c_vscale[VOICES]; // array of scale factors + t_int c_next_voice; // next voice to steal (round robin) + u32 c_phase; // phase of main oscillator + u32 c_phase2; // phase of secondairy oscillator + t_float c_state; // state of the square wave + t_float c_prev_amp; // previous input of comparator + t_float c_phase_inc_scale; + t_float c_scale; + t_float c_scale_update; + DSPIfilterSeries* c_butter; // the series filter + t_symbol *c_waveform; + +} t_bloscctl; + +typedef struct blosc +{ + t_object x_obj; + t_float x_f; + t_bloscctl x_ctl; +} t_blosc; + + +/* phase converters */ +static inline float _phase_to_float(u32 p){return ((float)p) * (1.0f / 4294967296.0f);} +static inline u32 _float_to_phase(float f){return ((u32)(f * 4294967296.0f)) & ~(S-1);} + + +/* flat table: better for linear interpolation */ +static inline float _play_voice_lint(float *table, t_int *index, float frac, float scale) +{ + t_int i = *index; + + /* perform linear interpolation */ + float f = (((1.0f - frac) * table[i]) + (table[i+1] * frac)) * scale; + + /* increment phase index if next 2 elements will still be inside table + if not there's no increment and the voice will keep playing the same sample */ + + i += (((i+S+1) >> LTABLE) ^ 1) << LOVERSAMPLE; + + *index = i; + return f; +} + +/* get one sample from the bandlimited discontinuity wavetable playback syth */ +static inline t_float _get_bandlimited_discontinuity(t_bloscctl *ctl, float *table) +{ + float sum = 0.0f; + int i; + /* sum all voices */ + for (i=0; i<VOICES; i++){ + sum += _play_voice_lint(table, ctl->c_index+i, ctl->c_frac[i], ctl->c_vscale[i]); + } + + return sum; +} + + +/* update waveplayers on zero cross */ +static void _bang_comparator(t_bloscctl *ctl, float prev, float curr) +{ + + /* check for sign change */ + if ((prev * curr) < 0.0f){ + + int voice; + + /* determine the location of the discontinuity (in oversampled coordiates + using linear interpolation */ + + float f = (float)S * curr / (curr - prev); + + /* get the offset in the oversample table */ + + u32 table_index = (u32)f; + + /* determine the fractional part (in oversampled coordinates) + for linear interpolation */ + + float table_frac_index = f - (float)table_index; + + /* set state (+ or -) */ + + ctl->c_state = (curr > 0.0f) ? 0.5f : -0.5f; + + /* steal the oldest voice */ + + voice = ctl->c_next_voice++; + ctl->c_next_voice &= VOICES-1; + + /* initialize the new voice index and interpolation fraction */ + + ctl->c_index[voice] = table_index; + ctl->c_frac[voice] = table_frac_index; + ctl->c_vscale[voice] = -ctl->c_scale * 2.0f * ctl->c_state; + + } + +} + + +/* advance phasor and update waveplayers on phase wrap */ +static void _bang_phasor(t_bloscctl *ctl, float freq) +{ + u32 phase = ctl->c_phase; + u32 phase_inc; + u32 oldphase; + int voice; + float scale = ctl->c_scale; + + /* get increment */ + float inc = freq * ctl->c_phase_inc_scale; + + /* calculate new phase + the increment (and the phase) should be a multiple of S */ + if (inc < 0.0f) inc = -inc; + phase_inc = ((u32)inc) & ~(S-1); + oldphase = phase; + phase += phase_inc; + + + /* check for phase wrap */ + if (phase < oldphase){ + u32 phase_inc_decimated = phase_inc >> LOVERSAMPLE; + u32 table_index; + u32 table_phase; + + /* steal the oldest voice if we have a phase wrap */ + + voice = ctl->c_next_voice++; + ctl->c_next_voice &= VOICES-1; + + /* determine the location of the discontinuity (in oversampled coordinates) + which is S * (new phase) / (increment) */ + + table_index = phase / phase_inc_decimated; + + /* determine the fractional part (in oversampled coordinates) + for linear interpolation */ + + table_phase = phase - (table_index * phase_inc_decimated); + + /* use it to initialize the new voice index and interpolation fraction */ + + ctl->c_index[voice] = table_index; + ctl->c_frac[voice] = (float)table_phase / (float)phase_inc_decimated; + ctl->c_vscale[voice] = scale; + scale = scale * ctl->c_scale_update; + + } + + /* save state */ + ctl->c_phase = phase; + ctl->c_scale = scale; +} + + +/* the 2 oscillator version: + the second osc can reset the first osc's phase (hence it determines the pitch) + the first osc determines the waveform */ + +static void _bang_hardsync_phasor(t_bloscctl *ctl, float freq, float freq2) +{ + u32 phase = ctl->c_phase; + u32 phase2 = ctl->c_phase2; + u32 phase_inc; + u32 phase_inc2; + u32 oldphase; + u32 oldphase2; + int voice; + float scale = ctl->c_scale; + + + /* get increment */ + float inc = freq * ctl->c_phase_inc_scale; + float inc2 = freq2 * ctl->c_phase_inc_scale; + + /* calculate new phases + the increment (and the phase) should be a multiple of S */ + + /* save previous phases */ + oldphase = phase; + oldphase2 = phase2; + + /* update second osc */ + if (inc2 < 0.0f) inc2 = -inc2; + phase_inc2 = ((u32)inc2) & ~(S-1); + phase2 += phase_inc2; + + /* update first osc (freq should be >= freq of sync osc */ + if (inc < 0.0f) inc = -inc; + phase_inc = ((u32)inc) & ~(S-1); + if (phase_inc < phase_inc2) phase_inc = phase_inc2; + phase += phase_inc; + + + /* check for sync discontinuity (osc 2) */ + if (phase2 < oldphase2) { + + /* adjust phase depending on the location of the discontinuity in phase2: + phase/phase_inc == phase2/phase_inc2 */ + + u64 pi = phase_inc >> LOVERSAMPLE; + u64 pi2 = phase_inc2 >> LOVERSAMPLE; + u64 lphase = ((u64)phase2 * pi) / pi2; + phase = lphase & ~(S-1); + } + + + /* check for phase discontinuity (osc 1) */ + if (phase < oldphase){ + u32 phase_inc_decimated = phase_inc >> LOVERSAMPLE; + u32 table_index; + u32 table_phase; + float stepsize; + + /* steal the oldest voice if we have a phase wrap */ + + voice = ctl->c_next_voice++; + ctl->c_next_voice &= VOICES-1; + + /* determine the location of the discontinuity (in oversampled coordinates) + which is S * (new phase) / (increment) */ + + table_index = phase / phase_inc_decimated; + + /* determine the fractional part (in oversampled coordinates) + for linear interpolation */ + + table_phase = phase - (table_index * phase_inc_decimated); + + /* determine the step size + as opposed to saw/impulse waveforms, the step is not always equal to one. it is: + oldphase - phase + phase_inc + but for the unit step this will overflow to zero, so we + reduce the bit depth to prevent overflow */ + + stepsize = _phase_to_float(((oldphase-phase) >> LOVERSAMPLE) + + phase_inc_decimated) * (float)S; + + /* use it to initialize the new voice index and interpolation fraction */ + + ctl->c_index[voice] = table_index; + ctl->c_frac[voice] = (float)table_phase / (float)phase_inc_decimated; + ctl->c_vscale[voice] = scale * stepsize; + scale = scale * ctl->c_scale_update; + + } + + /* save state */ + ctl->c_phase = phase; + ctl->c_phase2 = phase2; + ctl->c_scale = scale; +} + + +static t_int *blosc_perform_hardsync_saw(t_int *w) +{ + t_float *freq = (float *)(w[3]); + t_float *freq2 = (float *)(w[4]); + t_float *out = (float *)(w[5]); + t_bloscctl *ctl = (t_bloscctl *)(w[1]); + t_int n = (t_int)(w[2]); + t_int i; + + /* set postfilter cutoff */ + ctl->c_butter->setButterHP(0.85f * (*freq / sys_getsr())); + + while (n--) { + float frequency = *freq++; + float frequency2 = *freq2++; + + /* get the bandlimited discontinuity */ + float sample = _get_bandlimited_discontinuity(ctl, bls); + + /* add aliased sawtooth wave */ + sample += _phase_to_float(ctl->c_phase) - 0.5f; + + /* highpass filter output to remove DC offset and low frequency aliasing */ + ctl->c_butter->BangSmooth(sample, sample, 0.05f); + + /* send to output */ + *out++ = sample; + + /* advance phasor */ + _bang_hardsync_phasor(ctl, frequency2, frequency); + + } + + return (w+6); +} + +static t_int *blosc_perform_saw(t_int *w) +{ + t_float *freq = (float *)(w[3]); + t_float *out = (float *)(w[4]); + t_bloscctl *ctl = (t_bloscctl *)(w[1]); + t_int n = (t_int)(w[2]); + t_int i; + + while (n--) { + float frequency = *freq++; + + /* get the bandlimited discontinuity */ + float sample = _get_bandlimited_discontinuity(ctl, bls); + + /* add aliased sawtooth wave */ + sample += _phase_to_float(ctl->c_phase) - 0.5f; + + /* send to output */ + *out++ = sample; + + /* advance phasor */ + _bang_phasor(ctl, frequency); + + } + + return (w+5); +} + + + +static t_int *blosc_perform_pulse(t_int *w) +{ + t_float *freq = (float *)(w[3]); + t_float *out = (float *)(w[4]); + t_bloscctl *ctl = (t_bloscctl *)(w[1]); + t_int n = (t_int)(w[2]); + t_int i; + + + /* set postfilter cutoff */ + ctl->c_butter->setButterHP(0.85f * (*freq / sys_getsr())); + + while (n--) { + float frequency = *freq++; + + /* get the bandlimited discontinuity */ + float sample = _get_bandlimited_discontinuity(ctl, bli); + + /* highpass filter output to remove DC offset and low frequency aliasing */ + ctl->c_butter->BangSmooth(sample, sample, 0.05f); + + /* send to output */ + *out++ = sample; + + /* advance phasor */ + _bang_phasor(ctl, frequency); + + } + + return (w+5); +} + +static t_int *blosc_perform_comparator(t_int *w) +{ + t_float *amp = (float *)(w[3]); + t_float *out = (float *)(w[4]); + t_bloscctl *ctl = (t_bloscctl *)(w[1]); + t_int n = (t_int)(w[2]); + t_int i; + t_float prev_amp = ctl->c_prev_amp; + + while (n--) { + float curr_amp = *amp++; + + /* exact zero won't work for zero detection (sic) */ + if (curr_amp == 0.0f) curr_amp = 0.0000001f; + + /* get the bandlimited discontinuity */ + float sample = _get_bandlimited_discontinuity(ctl, bls); + + /* add the block wave state */ + sample += ctl->c_state; + + /* send to output */ + *out++ = sample; + + /* advance phasor */ + _bang_comparator(ctl, prev_amp, curr_amp); + + prev_amp = curr_amp; + + } + + ctl->c_prev_amp = prev_amp; + + return (w+5); +} + +static void blosc_phase(t_blosc *x, t_float f) +{ + x->x_ctl.c_phase = _float_to_phase(f); + x->x_ctl.c_phase2 = _float_to_phase(f); +} + +static void blosc_phase1(t_blosc *x, t_float f) +{ + x->x_ctl.c_phase = _float_to_phase(f); +} + +static void blosc_phase2(t_blosc *x, t_float f) +{ + x->x_ctl.c_phase2 = _float_to_phase(f); +} + +static void blosc_dsp(t_blosc *x, t_signal **sp) +{ + int n = sp[0]->s_n; + + /* set sampling rate scaling for phasors */ + x->x_ctl.c_phase_inc_scale = 4.0f * (float)(1<<(LPHASOR-2)) / sys_getsr(); + + + /* setup & register the correct process routine depending on the waveform */ + + /* 2 osc */ + if (x->x_ctl.c_waveform == gensym("syncsaw")){ + x->x_ctl.c_scale = 1.0f; + x->x_ctl.c_scale_update = 1.0f; + dsp_add(blosc_perform_hardsync_saw, 5, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec, sp[2]->s_vec); + } + + /* 1 osc */ + else if (x->x_ctl.c_waveform == gensym("pulse")){ + x->x_ctl.c_scale = 1.0f; + x->x_ctl.c_scale_update = 1.0f; + dsp_add(blosc_perform_pulse, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); + } + else if (x->x_ctl.c_waveform == gensym("pulse2")){ + x->x_ctl.c_phase_inc_scale *= 2; + x->x_ctl.c_scale = 1.0f; + x->x_ctl.c_scale_update = -1.0f; + dsp_add(blosc_perform_pulse, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); + } + else if (x->x_ctl.c_waveform == gensym("comparator")){ + x->x_ctl.c_scale = 1.0f; + x->x_ctl.c_scale_update = 1.0f; + dsp_add(blosc_perform_comparator, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); + } + else{ + x->x_ctl.c_scale = 1.0f; + x->x_ctl.c_scale_update = 1.0f; + dsp_add(blosc_perform_saw, 4, &x->x_ctl, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); + } + + + +} +static void blosc_free(t_blosc *x) +{ + delete x->x_ctl.c_butter; +} + +t_class *blosc_class; + +static void *blosc_new(t_symbol *s) +{ + t_blosc *x = (t_blosc *)pd_new(blosc_class); + int i; + + /* out 1 */ + outlet_new(&x->x_obj, gensym("signal")); + + /* optional signal inlets */ + if (s == gensym("syncsaw")){ + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + } + + /* optional phase inlet */ + if (s != gensym("comparator")){ + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("phase")); + } + + /* create the postfilter */ + x->x_ctl.c_butter = new DSPIfilterSeries(3); + + /* init oscillators */ + for (i=0; i<VOICES; i++) { + x->x_ctl.c_index[i] = N-2; + x->x_ctl.c_frac[i] = 0.0f; + } + + /* init rest of state data */ + blosc_phase(x, 0); + blosc_phase2(x, 0); + x->x_ctl.c_state = 0.0; + x->x_ctl.c_prev_amp = 0.0; + x->x_ctl.c_next_voice = 0; + x->x_ctl.c_scale = 1.0f; + x->x_ctl.c_scale_update = 1.0f; + x->x_ctl.c_waveform = s; + + return (void *)x; +} + + + + + + + +/* CLASS DATA INIT (tables) */ + + +/* some vector ops */ + +/* clear a buffer */ +static inline void _clear(float *array, int size) +{ + memset(array, 0, sizeof(float)*size); +} + +/* compute complex log */ +static inline void _clog(float *real, float *imag, int size) +{ + int k; + for (k=0; k<size; k++){ + float r = real[k]; + float i = imag[k]; + float radius = sqrt(r*r+i*i); + real[k] = log(radius); + imag[k] = atan2(i,r); + } +} + +/* compute complex exp */ +static inline void _cexp(float *real, float *imag, int size) +{ + int k; + for (k=0; k<size; k++){ + float r = exp(real[k]); + float i = imag[k]; + real[k] = r * cos(i); + imag[k] = r * sin(i); + } +} + + +/* compute fft */ +static inline void _fft(float *real, float *imag, int size) +{ + int i; + float scale = 1.0f / sqrt((float)size); + for (i=0; i<size; i++){ + real[i] *= scale; + imag[i] *= scale; + if (isnan(real[i])) post("fftpanic %d", i); + } + mayer_fft(size, real, imag); +} +/* compute ifft */ +static inline void _ifft(float *real, float *imag, int size) +{ + int i; + float scale = 1.0f / sqrt((float)size); + for (i=0; i<size; i++){ + real[i] *= scale; + imag[i] *= scale; + if (isnan(real[i])) post("ifftpanic %d", i); + } + mayer_ifft(size, real, imag); +} + +/* convert an integer index to a phase: [0 -> pi, -pi -> 0] */ +static inline float _i2theta(int i, int size){ + float p = 2.0f * M_PI * (float)i / (float)size; + if (p >= M_PI) p -= 2.0f * M_PI; + return p; +} + + +/* print matlab array */ +static void _printm(float *array, char *name, int size) +{ + int i; + fprintf(stderr, "%s = [", name); + for (i=0; i<size; i++){ + fprintf(stderr, "%f;", array[i]); + } + fprintf(stderr, "];\n"); +} + +/* store oversampled waveform as decimated chunks */ +static void _store_decimated(float *dst, float *src, float scale, int size) +{ + int i; + for (i=0; i<size; i++){ + int offset = (i % S) * L; + int index = i / S; + dst[offset+index] = scale * src[i]; + } + +} + +/* store waveform as one chunk */ +static void _store(float *dst, float *src, float scale, int size) +{ + int i; + for (i=0; i<size; i++){ + dst[i] = scale * src[i]; + } + +} + +/* create a minimum phase bandlimited impulse */ +static void build_tables(void) +{ + + /* table size = M>=N (time padding to reduce time aliasing) */ + + /* we work in the complex domain to eliminate the need to avoid + negative spectral components */ + + float real[M]; + float imag[M]; + float sum,scale; + int i,j; + + + /* create windowed sinc */ + _clear(imag, M); + real[0] = 1.0f; + for (i=1; i<M; i++){ + float tw = _i2theta(i,M); + float ts = tw * NBPERIODS * (float)(M) / (float)(N); + + /* sinc */ + real[i] = sin(ts)/ts; + + /* blackman window */ + real[i] *= 0.42f + 0.5f * (cos(tw)) + 0.08f * (cos(2.0f*tw)); + + //real[i] *= 0.5f * (1.0f + WALPHA) + 0.5f * (1.0f - WALPHA) * (cos(tw)); + + /* check for nan */ + if (isnan(real[i])) post("sinc NaN panic %d", i); + if (isinf(real[i])) post("sinc Inf panic %d", i); + + } + + + /* compute cepstrum */ + _fft(real, imag, M); + _clog(real, imag, M); + _ifft(real, imag, M); + + + /* kill anti-causal part (contribution of non minimum phase zeros) */ + /* should we kill nyquist too ?? */ + for (i=M/2+1; i<M; i++){ + real[i] *= 0.0000f; + imag[i] *= 0.0000f; + } + + + /* compute inverse cepstrum */ + _fft(real, imag, M); + _cexp(real, imag, M); + _ifft(real, imag, M); + + + + /* from here on, discard the padded part [N->M-1] + and work with the first N samples */ + + /* normalize impulse (integral = 1) */ + sum = 0.0f; + for (i=0; i<N; i++){sum += real[i];} + scale = 1.0f / sum; + for (i=0; i<N; i++){real[i] *= scale;} + + + /* store bli table */ + _store(bli, real, (float)S, N); + //_printm(bli, "h", N); + + + /* integrate impulse and invert to produce a step function + from 1->0 */ + sum = 0.0f; + for (i=0; i<N; i++){ + sum += real[i]; + real[i] = (1.0f - sum); + } + + /* store decimated bls tables */ + _store(bls, real, 1.0f, N); + + +} + +extern "C" +{ + void blosc_tilde_setup(void) + { + //post("blosc~ v0.1"); + + build_tables(); + + blosc_class = class_new(gensym("blosc~"), (t_newmethod)blosc_new, + (t_method)blosc_free, sizeof(t_blosc), 0, A_DEFSYMBOL, A_NULL); + CLASS_MAINSIGNALIN(blosc_class, t_blosc, x_f); + class_addmethod(blosc_class, (t_method)blosc_dsp, gensym("dsp"), A_NULL); + class_addmethod(blosc_class, (t_method)blosc_phase, gensym("phase"), A_FLOAT, A_NULL); + class_addmethod(blosc_class, (t_method)blosc_phase2, gensym("phase2"), A_FLOAT, A_NULL); + + + } + +} Deleted: branches/pd-extended/v0-40/externals/creb/modules++/filterortho.cc =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/filterortho.cc 2008-05-23 22:40:19 UTC (rev 9876) +++ branches/pd-extended/v0-40/externals/creb/modules++/filterortho.cc 2008-05-23 22:44:44 UTC (rev 9877) @@ -1,133 +0,0 @@ -/* - * filterortho.cc - orthogonal biquad filter pd interface - * Copyright (c) 2000-2003 by Tom Schouten - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -#include "m_pd.h" -#include <math.h> - -#include "DSPIcomplex.h" -#include "DSPIfilters.h" - - - -typedef struct filterortho_struct -{ - t_object x_obj; - t_float x_f; - DSPIfilterOrtho *filterortho; -} t_filterortho; - -void filterortho_bang(t_filterortho *x) -{ - -} - - -static t_int *filterortho_perform(t_int *w) -{ - - - t_float *in = (float *)(w[3]); - t_float *out = (float *)(w[4]); - DSPIfilterOrtho* filterortho = (DSPIfilterOrtho *)(w[1]); - t_int n = (t_int)(w[2]); - t_int i; - t_float x; - - - // dit kan beter - float smooth = 1.0f - pow(.05f,1.0f/(float)(n)); - - for (i = 0; i < n; i++) - { - x = *in++; - filterortho->BangSmooth(x, x, smooth); - *out++ = x; - } - - filterortho->killDenormals(); - - return (w+5); -} - -static void filterortho_dsp(t_filterortho *x, t_signal **sp) -{ - dsp_add(filterortho_perform, 4, x->filterortho, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); - -} -void filterortho_free(t_filterortho *x) -{ - delete x->filterortho; - -} - -t_class *filterortho_class; - - - -void setLP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setLP(f / sys_getsr(), Q);} -void setHP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setHP(f / sys_getsr(), Q);} -void setBP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setBP(f / sys_getsr(), Q);} -void setBR(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setBR(f / sys_getsr(), Q);} -void setAP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setAP(f / sys_getsr(), Q);} - -void setLS(t_filterortho *x, t_floatarg f, t_floatarg A) {x->filterortho->setLS(f / sys_getsr(), A);} -void setHS(t_filterortho *x, t_floatarg f, t_floatarg A) {x->filterortho->setHS(f / sys_getsr(), A);} - -void setEQ(t_filterortho *x, t_floatarg f, t_floatarg Q, t_floatarg A) {x->filterortho->setEQ(f / sys_getsr(), Q, A);} - - -void *filterortho_new() -{ - t_filterortho *x = (t_filterortho *)pd_new(filterortho_class); - x->filterortho = new DSPIfilterOrtho(); - outlet_new(&x->x_obj, gensym("signal")); - setLP(x, 10000, 2); - return (void *)x; -} - - - -extern "C" { - -void filterortho_tilde_setup(void) -{ - //post("filterortho~ v0.1"); - filterortho_class = class_new(gensym("filterortho~"), (t_newmethod)filterortho_new, - (t_method)filterortho_free, sizeof(t_filterortho), 0, A_NULL); - - CLASS_MAINSIGNALIN(filterortho_class, t_filterortho, x_f); - - - class_addmethod(filterortho_class, (t_method)filterortho_bang, gensym("bang"), A_NULL); - - class_addmethod(filterortho_class, (t_method)filterortho_dsp, gensym("dsp"), A_NULL); - - class_addmethod(filterortho_class, (t_method)setLP, gensym("setLP"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setHP, gensym("setHP"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setBP, gensym("setBP"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setBR, gensym("setBR"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setAP, gensym("setAP"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setLS, gensym("setLS"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setHS, gensym("setHS"), A_FLOAT, A_FLOAT, A_NULL); - class_addmethod(filterortho_class, (t_method)setEQ, gensym("setEQ"), A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); - -} - -} Copied: branches/pd-extended/v0-40/externals/creb/modules++/filterortho~.cc (from rev 9861, branches/pd-extended/v0-40/externals/creb/modules++/filterortho.cc) =================================================================== --- branches/pd-extended/v0-40/externals/creb/modules++/filterortho~.cc (rev 0) +++ branches/pd-extended/v0-40/externals/creb/modules++/filterortho~.cc 2008-05-23 22:44:44 UTC (rev 9877) @@ -0,0 +1,133 @@ +/* + * filterortho.cc - orthogonal biquad filter pd interface + * Copyright (c) 2000-2003 by Tom Schouten + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +#include "m_pd.h" +#include <math.h> + +#include "DSPIcomplex.h" +#include "DSPIfilters.h" + + + +typedef struct filterortho_struct +{ + t_object x_obj; + t_float x_f; + DSPIfilterOrtho *filterortho; +} t_filterortho; + +void filterortho_bang(t_filterortho *x) +{ + +} + + +static t_int *filterortho_perform(t_int *w) +{ + + + t_float *in = (float *)(w[3]); + t_float *out = (float *)(w[4]); + DSPIfilterOrtho* filterortho = (DSPIfilterOrtho *)(w[1]); + t_int n = (t_int)(w[2]); + t_int i; + t_float x; + + + // dit kan beter + float smooth = 1.0f - pow(.05f,1.0f/(float)(n)); + + for (i = 0; i < n; i++) + { + x = *in++; + filterortho->BangSmooth(x, x, smooth); + *out++ = x; + } + + filterortho->killDenormals(); + + return (w+5); +} + +static void filterortho_dsp(t_filterortho *x, t_signal **sp) +{ + dsp_add(filterortho_perform, 4, x->filterortho, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec); + +} +void filterortho_free(t_filterortho *x) +{ + delete x->filterortho; + +} + +t_class *filterortho_class; + + + +void setLP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setLP(f / sys_getsr(), Q);} +void setHP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setHP(f / sys_getsr(), Q);} +void setBP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setBP(f / sys_getsr(), Q);} +void setBR(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setBR(f / sys_getsr(), Q);} +void setAP(t_filterortho *x, t_floatarg f, t_floatarg Q) {x->filterortho->setAP(f / sys_getsr(), Q);} + +void setLS(t_filterortho *x, t_floatarg f, t_floatarg A) {x->filterortho->setLS(f / sys_getsr(), A);} +void setHS(t_filterortho *x, t_floatarg f, t_floatarg A) {x->filterortho->setHS(f / sys_getsr(), A);} + +void setEQ(t_filterortho *x, t_floatarg f, t_floatarg Q, t_floatarg A) {x->filterortho->setEQ(f / sys_getsr(), Q, A);} + + +void *filterortho_new() +{ + t_filterortho *x = (t_filterortho *)pd_new(filterortho_class); + x->filterortho = new DSPIfilterOrtho(); + outlet_new(&x->x_obj, gensym("signal")); + setLP(x, 10000, 2); + return (void *)x; +} + + + +extern "C" { + +void filterortho_tilde_setup(void) +{ + //post("filterortho~ v0.1"); + filterortho_class = class_new(gensym("filterortho~"), (t_newmethod)filterortho_new, + (t_method)filterortho_free, sizeof(t_filterortho), 0, A_NULL); + + CLASS_MAINSIGNALIN(filterortho_class, t_filterortho, x_f); + + + class_addmethod(filterortho_class, (t_method)filterortho_bang, gensym("bang"), A_NULL); + + class_addmethod(filterortho_class, (t_method)filterortho_dsp, gensym("dsp"), A_NULL); + + class_addmethod(filterortho_class, (t_method)setLP, gensym("setLP"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setHP, gensym("setHP"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setBP, gensym("setBP"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setBR, gensym("setBR"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setAP, gensym("setAP"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setLS, gensym("setLS"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setHS, gensym("setHS"), A_FLOAT, A_FLOAT, A_NULL); + class_addmethod(filterortho_class, (t_method)setEQ, gensym("setEQ"), A_FLOAT, A_FLOAT, A_FLOAT, A_NULL); + +} + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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 May 2008