Pd-cvs July 2008

pd-cvs@lists.iem.at

17 participants
156 discussions

SF.net SVN: pure-data:[10212] trunk/externals/iem/iemguts/src
by zmoelnig＠users.sourceforge.net 23 Jul '08

23 Jul '08

Revision: 10212 http://pure-data.svn.sourceforge.net/pure-data/?rev=10212&view=rev Author: zmoelnig Date: 2008-07-23 11:47:41 +0000 (Wed, 23 Jul 2008) Log Message: ----------- fixed rename of canvasconnections;; added boilerplate to oreceive Modified Paths: -------------- trunk/externals/iem/iemguts/src/canvasconnections.c trunk/externals/iem/iemguts/src/oreceive.c Modified: trunk/externals/iem/iemguts/src/canvasconnections.c =================================================================== --- trunk/externals/iem/iemguts/src/canvasconnections.c 2008-07-23 11:41:40 UTC (rev 10211) +++ trunk/externals/iem/iemguts/src/canvasconnections.c 2008-07-23 11:47:41 UTC (rev 10212) @@ -1,7 +1,7 @@ /****************************************************** * - * canvasconnection - implementation file + * canvasconnections - implementation file * * copyleft (c) IOhannes m zm\xF6lnig * @@ -20,7 +20,7 @@ * this object provides a way to send messages to upstream canvases * by default it sends messages to the containing canvas, but you can give the * "depth" as argument; - * e.g. [canvasconnection 1] will send messages to the parent of the containing canvas + * e.g. [canvasconnections 1] will send messages to the parent of the containing canvas */ #include "m_pd.h" @@ -29,19 +29,19 @@ int glist_getindex(t_glist *x, t_gobj *y); -/* ------------------------- canvasconnection ---------------------------- */ +/* ------------------------- canvasconnections ---------------------------- */ -static t_class *canvasconnection_class; +static t_class *canvasconnections_class; -typedef struct _canvasconnection +typedef struct _canvasconnections { t_object x_obj; t_canvas *x_parent; t_object *x_object; t_outlet *x_out; -} t_canvasconnection; +} t_canvasconnections; -static void canvasconnection_outlets(t_canvasconnection *x) +static void canvasconnections_outlets(t_canvasconnections *x) { int noutlets=0; int nout=0; @@ -81,22 +81,22 @@ } } -static void canvasconnection_bang(t_canvasconnection *x) +static void canvasconnections_bang(t_canvasconnections *x) { - canvasconnection_outlets(x); + canvasconnections_outlets(x); } -static void canvasconnection_free(t_canvasconnection *x) +static void canvasconnections_free(t_canvasconnections *x) { x->x_object=0; outlet_free(x->x_out); x->x_out=0; } -static void *canvasconnection_new(t_floatarg f) +static void *canvasconnections_new(t_floatarg f) { - t_canvasconnection *x = (t_canvasconnection *)pd_new(canvasconnection_class); + t_canvasconnections *x = (t_canvasconnections *)pd_new(canvasconnections_class); t_glist *glist=(t_glist *)canvas_getcurrent(); t_canvas *canvas=(t_canvas*)glist_getcanvas(glist); int depth=(int)f; @@ -121,9 +121,9 @@ return (x); } -void canvasconnection_setup(void) +void canvasconnections_setup(void) { - canvasconnection_class = class_new(gensym("canvasconnection"), (t_newmethod)canvasconnection_new, - (t_method)canvasconnection_free, sizeof(t_canvasconnection), 0, A_DEFFLOAT, 0); - class_addbang(canvasconnection_class, (t_method)canvasconnection_bang); + canvasconnections_class = class_new(gensym("canvasconnections"), (t_newmethod)canvasconnections_new, + (t_method)canvasconnections_free, sizeof(t_canvasconnections), 0, A_DEFFLOAT, 0); + class_addbang(canvasconnections_class, (t_method)canvasconnections_bang); } Modified: trunk/externals/iem/iemguts/src/oreceive.c =================================================================== --- trunk/externals/iem/iemguts/src/oreceive.c 2008-07-23 11:41:40 UTC (rev 10211) +++ trunk/externals/iem/iemguts/src/oreceive.c 2008-07-23 11:47:41 UTC (rev 10212) @@ -1,4 +1,22 @@ +/****************************************************** + * + * oreceive - implementation file + * + * copyleft (c) IOhannes m zm\xF6lnig + * + * 2307:forum::f\xFCr::uml\xE4ute:2008 + * + * institute of electronic music and acoustics (iem) + * unsiversity of music and dramatic arts graz (kug) + * + ****************************************************** + * + * license: GNU General Public License v.2 + * + ******************************************************/ + + #include "m_pd.h" #if 0 @@ -11,7 +29,12 @@ /* ------------------------------------------------------------- */ -/* there come the guts: our own bind/unbind mechanism that + +/* + * [oreceive] : ordered receive + * + * + * there come the guts: our own bind/unbind mechanism that * includes priorities * * the plan is as follows: @@ -249,7 +272,6 @@ x->x_sym = s; x->x_priority = priority; pd_bind_priority(&x->x_obj.ob_pd, s, priority); - // pd_bind(&x->x_obj.ob_pd, s); outlet_new(&x->x_obj, 0); return (x); } 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:[10211] trunk/externals/iem/iemguts/src
by zmoelnig＠users.sourceforge.net 23 Jul '08

23 Jul '08

Revision: 10211 http://pure-data.svn.sourceforge.net/pure-data/?rev=10211&view=rev Author: zmoelnig Date: 2008-07-23 11:41:40 +0000 (Wed, 23 Jul 2008) Log Message: ----------- renamed object Added Paths: ----------- trunk/externals/iem/iemguts/src/canvasconnections.c Removed Paths: ------------- trunk/externals/iem/iemguts/src/canvasconnection.c Deleted: trunk/externals/iem/iemguts/src/canvasconnection.c =================================================================== --- trunk/externals/iem/iemguts/src/canvasconnection.c 2008-07-23 10:17:37 UTC (rev 10210) +++ trunk/externals/iem/iemguts/src/canvasconnection.c 2008-07-23 11:41:40 UTC (rev 10211) @@ -1,129 +0,0 @@ - -/****************************************************** - * - * canvasconnection - implementation file - * - * copyleft (c) IOhannes m zm\xF6lnig - * - * 2007:forum::f\xFCr::uml\xE4ute:2007 - * - * institute of electronic music and acoustics (iem) - * - ****************************************************** - * - * license: GNU General Public License v.2 - * - ******************************************************/ - - -/* - * this object provides a way to send messages to upstream canvases - * by default it sends messages to the containing canvas, but you can give the - * "depth" as argument; - * e.g. [canvasconnection 1] will send messages to the parent of the containing canvas - */ - -#include "m_pd.h" -#include "g_canvas.h" -#include "m_imp.h" - -int glist_getindex(t_glist *x, t_gobj *y); - -/* ------------------------- canvasconnection ---------------------------- */ - -static t_class *canvasconnection_class; - -typedef struct _canvasconnection -{ - t_object x_obj; - t_canvas *x_parent; - t_object *x_object; - t_outlet *x_out; -} t_canvasconnection; - -static void canvasconnection_outlets(t_canvasconnection *x) -{ - int noutlets=0; - int nout=0; - t_atom at; - - if(0==x->x_object || 0==x->x_parent) - return; - - noutlets=obj_noutlets(x->x_object); - SETFLOAT(&at, (t_float)noutlets); - - outlet_anything(x->x_out, gensym("outlets"), 1, &at); - for(nout=0; nout<noutlets; nout++) { - t_outlet*out=0; - t_outconnect*conn=obj_starttraverseoutlet(x->x_object, &out, nout); - t_object*dest=0; - t_inlet*in=0; - int which=0; - int count=0, i=0; - t_atom*abuf=0; - while(conn) { - conn=obj_nexttraverseoutlet(conn, &dest, &in, &which); - count++; - } - abuf=(t_atom*)getbytes(sizeof(t_atom)*(count+1)); - SETFLOAT(abuf, nout); - conn=obj_starttraverseoutlet(x->x_object, &out, nout); - while(conn) { - t_float connid=0; - conn=obj_nexttraverseoutlet(conn, &dest, &in, &which); - connid = glist_getindex(x->x_parent, (t_gobj*)dest); - SETFLOAT(abuf+1+i, connid); - i++; - } - outlet_anything(x->x_out, gensym("outlet"), count+1, abuf); - freebytes(abuf, sizeof(t_atom)*(count+1)); - } -} - -static void canvasconnection_bang(t_canvasconnection *x) -{ - canvasconnection_outlets(x); -} - - -static void canvasconnection_free(t_canvasconnection *x) -{ - x->x_object=0; - outlet_free(x->x_out); - x->x_out=0; -} - -static void *canvasconnection_new(t_floatarg f) -{ - t_canvasconnection *x = (t_canvasconnection *)pd_new(canvasconnection_class); - t_glist *glist=(t_glist *)canvas_getcurrent(); - t_canvas *canvas=(t_canvas*)glist_getcanvas(glist); - int depth=(int)f; - if(depth<0)depth=0; - - x->x_parent=0; - x->x_object=0; - - while(depth && canvas) { - canvas=canvas->gl_owner; - depth--; - } - - - if(canvas) { - x->x_object = pd_checkobject((t_pd*)canvas); - x->x_parent = canvas->gl_owner; - } - - x->x_out=outlet_new(&x->x_obj, 0); - - return (x); -} - -void canvasconnection_setup(void) -{ - canvasconnection_class = class_new(gensym("canvasconnection"), (t_newmethod)canvasconnection_new, - (t_method)canvasconnection_free, sizeof(t_canvasconnection), 0, A_DEFFLOAT, 0); - class_addbang(canvasconnection_class, (t_method)canvasconnection_bang); -} Copied: trunk/externals/iem/iemguts/src/canvasconnections.c (from rev 10210, trunk/externals/iem/iemguts/src/canvasconnection.c) =================================================================== --- trunk/externals/iem/iemguts/src/canvasconnections.c (rev 0) +++ trunk/externals/iem/iemguts/src/canvasconnections.c 2008-07-23 11:41:40 UTC (rev 10211) @@ -0,0 +1,129 @@ + +/****************************************************** + * + * canvasconnection - implementation file + * + * copyleft (c) IOhannes m zm\xF6lnig + * + * 2007:forum::f\xFCr::uml\xE4ute:2007 + * + * institute of electronic music and acoustics (iem) + * + ****************************************************** + * + * license: GNU General Public License v.2 + * + ******************************************************/ + + +/* + * this object provides a way to send messages to upstream canvases + * by default it sends messages to the containing canvas, but you can give the + * "depth" as argument; + * e.g. [canvasconnection 1] will send messages to the parent of the containing canvas + */ + +#include "m_pd.h" +#include "g_canvas.h" +#include "m_imp.h" + +int glist_getindex(t_glist *x, t_gobj *y); + +/* ------------------------- canvasconnection ---------------------------- */ + +static t_class *canvasconnection_class; + +typedef struct _canvasconnection +{ + t_object x_obj; + t_canvas *x_parent; + t_object *x_object; + t_outlet *x_out; +} t_canvasconnection; + +static void canvasconnection_outlets(t_canvasconnection *x) +{ + int noutlets=0; + int nout=0; + t_atom at; + + if(0==x->x_object || 0==x->x_parent) + return; + + noutlets=obj_noutlets(x->x_object); + SETFLOAT(&at, (t_float)noutlets); + + outlet_anything(x->x_out, gensym("outlets"), 1, &at); + for(nout=0; nout<noutlets; nout++) { + t_outlet*out=0; + t_outconnect*conn=obj_starttraverseoutlet(x->x_object, &out, nout); + t_object*dest=0; + t_inlet*in=0; + int which=0; + int count=0, i=0; + t_atom*abuf=0; + while(conn) { + conn=obj_nexttraverseoutlet(conn, &dest, &in, &which); + count++; + } + abuf=(t_atom*)getbytes(sizeof(t_atom)*(count+1)); + SETFLOAT(abuf, nout); + conn=obj_starttraverseoutlet(x->x_object, &out, nout); + while(conn) { + t_float connid=0; + conn=obj_nexttraverseoutlet(conn, &dest, &in, &which); + connid = glist_getindex(x->x_parent, (t_gobj*)dest); + SETFLOAT(abuf+1+i, connid); + i++; + } + outlet_anything(x->x_out, gensym("outlet"), count+1, abuf); + freebytes(abuf, sizeof(t_atom)*(count+1)); + } +} + +static void canvasconnection_bang(t_canvasconnection *x) +{ + canvasconnection_outlets(x); +} + + +static void canvasconnection_free(t_canvasconnection *x) +{ + x->x_object=0; + outlet_free(x->x_out); + x->x_out=0; +} + +static void *canvasconnection_new(t_floatarg f) +{ + t_canvasconnection *x = (t_canvasconnection *)pd_new(canvasconnection_class); + t_glist *glist=(t_glist *)canvas_getcurrent(); + t_canvas *canvas=(t_canvas*)glist_getcanvas(glist); + int depth=(int)f; + if(depth<0)depth=0; + + x->x_parent=0; + x->x_object=0; + + while(depth && canvas) { + canvas=canvas->gl_owner; + depth--; + } + + + if(canvas) { + x->x_object = pd_checkobject((t_pd*)canvas); + x->x_parent = canvas->gl_owner; + } + + x->x_out=outlet_new(&x->x_obj, 0); + + return (x); +} + +void canvasconnection_setup(void) +{ + canvasconnection_class = class_new(gensym("canvasconnection"), (t_newmethod)canvasconnection_new, + (t_method)canvasconnection_free, sizeof(t_canvasconnection), 0, A_DEFFLOAT, 0); + class_addbang(canvasconnection_class, (t_method)canvasconnection_bang); +} Property changes on: trunk/externals/iem/iemguts/src/canvasconnections.c ___________________________________________________________________ Added: svn:mergeinfo + 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:[10210] trunk/externals/iem/iemguts/src/ canvasconnection.c
by zmoelnig＠users.sourceforge.net 23 Jul '08

23 Jul '08

Revision: 10210 http://pure-data.svn.sourceforge.net/pure-data/?rev=10210&view=rev Author: zmoelnig Date: 2008-07-23 10:17:37 +0000 (Wed, 23 Jul 2008) Log Message: ----------- added x_object for similicity Modified Paths: -------------- trunk/externals/iem/iemguts/src/canvasconnection.c Modified: trunk/externals/iem/iemguts/src/canvasconnection.c =================================================================== --- trunk/externals/iem/iemguts/src/canvasconnection.c 2008-07-23 10:16:01 UTC (rev 10209) +++ trunk/externals/iem/iemguts/src/canvasconnection.c 2008-07-23 10:17:37 UTC (rev 10210) @@ -103,16 +103,18 @@ if(depth<0)depth=0; x->x_parent=0; + x->x_object=0; while(depth && canvas) { canvas=canvas->gl_owner; depth--; } - x->x_object = pd_checkobject((t_pd*)canvas); - if(canvas) + if(canvas) { + x->x_object = pd_checkobject((t_pd*)canvas); x->x_parent = canvas->gl_owner; + } x->x_out=outlet_new(&x->x_obj, 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:[10209] trunk/externals/iem/iemguts/src/oreceive.c
by zmoelnig＠users.sourceforge.net 23 Jul '08

23 Jul '08

Revision: 10209 http://pure-data.svn.sourceforge.net/pure-data/?rev=10209&view=rev Author: zmoelnig Date: 2008-07-23 10:16:01 +0000 (Wed, 23 Jul 2008) Log Message: ----------- ordered receive: this is similar as [gemhead] priorities but more general Added Paths: ----------- trunk/externals/iem/iemguts/src/oreceive.c Added: trunk/externals/iem/iemguts/src/oreceive.c =================================================================== --- trunk/externals/iem/iemguts/src/oreceive.c (rev 0) +++ trunk/externals/iem/iemguts/src/oreceive.c 2008-07-23 10:16:01 UTC (rev 10209) @@ -0,0 +1,272 @@ + +#include "m_pd.h" + +#if 0 +# define debug_post post +#else +# define debug_post +#endif + +static t_class *oreceive_class, *oreceive_proxy_class, *oreceive_guts_class; + + +/* ------------------------------------------------------------- */ +/* there come the guts: our own bind/unbind mechanism that + * includes priorities + * + * the plan is as follows: + * [oreceive] tells us, which name it wants to bind to; + * it doesn't _really_ get bound to this name! + * + * we have an invisible permanent object, that keeps track of + * sorted (by priority) lists of the [oreceive] objects + * + * this object binds itself to the requested name + * and when it gets called, it in turn calls all the [oreceive] objects + * + * that's it + */ + + +typedef struct _bind_element { + t_pd *object; + t_float priority; + struct _bind_element*next; +} t_bind_element; + +typedef struct _bind_list { + t_object p_obj; + + t_symbol*key; + t_bind_element*elements; + struct _bind_list*next; +} t_oreceive_proxy; + +static t_oreceive_proxy*priority_receiver=0; + +static t_oreceive_proxy*guts_find_key(t_symbol*key) +{ + t_oreceive_proxy*binding=0; + + for(binding=priority_receiver; binding; binding=binding->next) { + if(binding->key == key) + return binding; + } + /* not found */ + return 0; +} + + +static t_oreceive_proxy*guts_add_key(t_symbol*key) +{ + t_oreceive_proxy*bind_list=0; + bind_list=(t_oreceive_proxy*)pd_new(oreceive_proxy_class); + bind_list->key=key; + bind_list->elements=0; + bind_list->next=0; + + debug_post("binding %x to %s", bind_list, key->s_name); + pd_bind(&bind_list->p_obj.ob_pd, key); + + t_oreceive_proxy*last=priority_receiver; + + if(last) { + while(last->next) { + last=last->next; + } + last->next = bind_list; + } else { + priority_receiver = bind_list; + } + + return bind_list; +} + +static void guts_add_element(t_oreceive_proxy*bind_list, t_bind_element*element) +{ + /* insert the object according to it's priority + * this is already the right queue + */ + t_float priority=element->priority; + t_bind_element*elements=bind_list->elements, *last=0; + debug_post("priority insert of %x:%g", element, priority); + + if(!elements || elements->priority >= priority) { + bind_list->elements = element; + element->next = elements; + debug_post("inserting in the beginngin"); + return; + } + + + debug_post("trying %x:%g", elements, elements->priority); + while(elements && elements->priority < priority) { + debug_post("skipping %x:%g to %x", elements, elements->priority, elements->next); + last=elements; + elements=elements->next; + } + + debug_post("inserting after %x:%g", last, (last ? (last->priority):0)); + debug_post("inserting befor %x:%g", elements, (elements?(elements->priority):0)); + + element->next=elements; + if(last) { + last->next = element; + } else { + bug("\nlast object invalid when inserting prioritized receiver\n"); + } +} + + +static void pd_bind_priority(t_pd*x, t_symbol*key, t_float priority) { + t_oreceive_proxy*bind_list=0; + t_bind_element*element=0; + debug_post("trying to bind '%s':%g via %x", key->s_name, priority, priority_receiver); + + bind_list=guts_find_key(key); + if(!bind_list) + bind_list=guts_add_key(key); + if(!bind_list)return; + + element=(t_bind_element*)getbytes(sizeof(t_bind_element)); + element->object=x; + element->priority=priority; + element->next=0; + + guts_add_element(bind_list, element); +} + + +static void pd_unbind_priority(t_pd*x, t_symbol*key) { + t_oreceive_proxy*list=0, *last=0; + t_bind_element*elements=0, *lastlmn=0; + + debug_post("trying to unbind '%s' from %x", key->s_name, priority_receiver); + + for(list=priority_receiver; list && list->key!=key; list=list->next){ + last=list; + } + if(!list)return; + + for(elements=list->elements; elements && elements->object != x; elements=elements->next) { + lastlmn=elements; + } + + if(elements) { + /* found it, now remove it */ + if(lastlmn) { + lastlmn->next=elements->next; + } else { + list->elements=elements->next; + } + + elements->object=0; + elements->priority=0; + elements->next=0; + + freebytes(elements, sizeof(elements)); + } else { + // not here... + } + + if(0==list->elements) { + // should we unbind ?? + if(last) { + last->next=list->next; + } else { + priority_receiver=list->next; + } + + pd_unbind(&list->p_obj.ob_pd, list->key); + list->next=0; + list->key=0; + + pd_free(&list->p_obj.ob_pd); + } +} + +/* -------------------- oreceive ------------------------------ */ + +typedef struct _oreceive +{ + t_object x_obj; + t_symbol *x_sym; + t_float x_priority; + + t_inlet*x_symin,*x_fltin; +} t_oreceive; + +static void oreceive_anything(t_oreceive *x, t_symbol *s, int argc, t_atom *argv); + +static void oreceive_proxy_anything(t_oreceive_proxy*p, t_symbol*s, int argc, t_atom*argv) +{ + t_bind_element*elements=p->elements; + + debug_post("proxy anything: %x", p); + + while(elements) { + t_pd*o=elements->object; + elements=elements->next; + if(o) { + oreceive_anything((t_oreceive*)o, s, argc, argv); + } + } +} + +/* ------------------------------------------------------------- */ + +static void oreceive_anything(t_oreceive *x, t_symbol *s, int argc, t_atom *argv) +{ + outlet_anything(x->x_obj.ob_outlet, s, argc, argv); +} + +static void oreceive_priority(t_oreceive *x, t_float p) +{ + x->x_priority=p; + if(x->x_sym) { + pd_unbind_priority(&x->x_obj.ob_pd, x->x_sym); + } + pd_bind_priority(&x->x_obj.ob_pd, x->x_sym, x->x_priority); +} + +static void oreceive_name(t_oreceive *x, t_symbol*s) +{ + if(x->x_sym) { + pd_unbind_priority(&x->x_obj.ob_pd, x->x_sym); + } + x->x_sym=s; + pd_bind_priority(&x->x_obj.ob_pd, x->x_sym, x->x_priority); +} + + +static void *oreceive_new(t_symbol *s, t_float priority) +{ + t_oreceive *x = (t_oreceive *)pd_new(oreceive_class); + + x->x_symin = inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_symbol, &s_symbol); + x->x_fltin = inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, &s_float); + + x->x_sym = s; + x->x_priority = priority; + pd_bind_priority(&x->x_obj.ob_pd, s, priority); + // pd_bind(&x->x_obj.ob_pd, s); + outlet_new(&x->x_obj, 0); + return (x); +} + +static void oreceive_free(t_oreceive *x) +{ + pd_unbind_priority(&x->x_obj.ob_pd, x->x_sym); +} + +void oreceive_setup(void) +{ + oreceive_class = class_new(gensym("oreceive"), (t_newmethod)oreceive_new, + (t_method)oreceive_free, sizeof(t_oreceive), CLASS_NOINLET, A_DEFSYM, A_DEFFLOAT, 0); + class_addcreator((t_newmethod)oreceive_new, gensym("r"), A_DEFSYM, A_DEFFLOAT, 0); + class_addsymbol(oreceive_class, oreceive_name); + class_addmethod(oreceive_class, (t_method)oreceive_priority, &s_float, A_FLOAT, 0); + + oreceive_proxy_class = class_new(0, 0, 0, sizeof(t_oreceive_proxy), CLASS_NOINLET | CLASS_PD, 0); + class_addanything(oreceive_proxy_class, oreceive_proxy_anything); +} 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:[10208] trunk/externals/iem/iemmatrix
by fzotter＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 10208 http://pure-data.svn.sourceforge.net/pure-data/?rev=10208&view=rev Author: fzotter Date: 2008-07-22 17:23:43 +0000 (Tue, 22 Jul 2008) Log Message: ----------- corrected [mtx_rfft] and [mtx_rifft] memory bugs. Modified Paths: -------------- trunk/externals/iem/iemmatrix/doc/mtx_rfft-help.pd trunk/externals/iem/iemmatrix/doc/mtx_rifft-help.pd trunk/externals/iem/iemmatrix/src/mtx_rfft.c trunk/externals/iem/iemmatrix/src/mtx_rifft.c Modified: trunk/externals/iem/iemmatrix/doc/mtx_rfft-help.pd =================================================================== --- trunk/externals/iem/iemmatrix/doc/mtx_rfft-help.pd 2008-07-22 15:30:52 UTC (rev 10207) +++ trunk/externals/iem/iemmatrix/doc/mtx_rfft-help.pd 2008-07-22 17:23:43 UTC (rev 10208) @@ -13,8 +13,8 @@ #X obj 11 169 mtx_ones; #X obj 11 213 mtx_- 1; #X obj 49 255 mtx_* 0; -#X floatatom 172 234 5 0 0 0 - - -; -#X text 212 232 <-- scroll here to select frequency; +#X floatatom 140 210 5 0 0 0 - - -; +#X text 184 208 <-- scroll here to select frequency; #X obj 172 255 / 8; #X obj 49 306 t a a; #X obj 92 306 mtx_print original; @@ -31,13 +31,14 @@ #X obj 261 438 mtx_rifft; #X obj 121 353 mtx_+ 0.5; #X obj 49 373 mtx_+ 0.5; +#X obj 140 231 t b f; #X connect 4 0 8 0; #X connect 7 0 10 0; #X connect 8 0 9 0; #X connect 9 0 7 0; #X connect 10 0 11 0; #X connect 11 0 20 0; -#X connect 12 0 14 0; +#X connect 12 0 30 0; #X connect 14 0 21 0; #X connect 15 0 26 0; #X connect 15 1 16 0; @@ -49,3 +50,5 @@ #X connect 26 1 28 0; #X connect 28 0 23 0; #X connect 29 0 24 0; +#X connect 30 0 4 0; +#X connect 30 1 14 0; Modified: trunk/externals/iem/iemmatrix/doc/mtx_rifft-help.pd =================================================================== --- trunk/externals/iem/iemmatrix/doc/mtx_rifft-help.pd 2008-07-22 15:30:52 UTC (rev 10207) +++ trunk/externals/iem/iemmatrix/doc/mtx_rifft-help.pd 2008-07-22 17:23:43 UTC (rev 10208) @@ -8,8 +8,8 @@ #X obj 11 169 mtx_ones; #X obj 11 213 mtx_- 1; #X obj 49 255 mtx_* 0; -#X floatatom 177 234 5 0 0 0 - - -; -#X obj 177 255 / 8; +#X floatatom 155 202 5 0 0 0 - - -; +#X obj 187 255 / 8; #X obj 49 278 t a a; #X text 266 443 see also:; #X text 46 34 real ifft in each matrix row; @@ -19,7 +19,7 @@ #X msg 11 147 1 9; #X obj 49 307 mtx_cos; #X obj 104 307 mtx_sin; -#X text 217 232 <-- scroll here to select delay; +#X text 199 203 <-- scroll here to select delay; #X obj 49 411 mtx_print rifft; #X obj 49 389 mtx_int; #X obj 103 255 * -3.14159; @@ -27,12 +27,13 @@ #X obj 262 463 mtx_rfft; #X obj 49 336 mtx_rifft; #X obj 49 362 mtx_+ 0.5; +#X obj 155 223 t b f; #X connect 4 0 15 0; #X connect 5 0 7 0; #X connect 6 0 5 0; #X connect 7 0 8 0; #X connect 8 0 11 0; -#X connect 9 0 10 0; +#X connect 9 0 26 0; #X connect 10 0 21 0; #X connect 11 0 16 0; #X connect 11 1 17 0; @@ -43,3 +44,5 @@ #X connect 21 0 8 1; #X connect 24 0 25 0; #X connect 25 0 20 0; +#X connect 26 0 4 0; +#X connect 26 1 10 0; Modified: trunk/externals/iem/iemmatrix/src/mtx_rfft.c =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_rfft.c 2008-07-22 15:30:52 UTC (rev 10207) +++ trunk/externals/iem/iemmatrix/src/mtx_rfft.c 2008-07-22 17:23:43 UTC (rev 10208) @@ -137,10 +137,13 @@ } #ifdef HAVE_FFTW3_H -static void writeFFTWComplexPartIntoList (int n, t_atom *l, fftw_complex *f, enum ComplexPart p) +static void writeFFTWComplexPartIntoList (int n, t_atom *l, fftw_complex *c, enum ComplexPart p) { - for (;n--;f++, l++) - SETFLOAT (l, ((t_float)*f[p])); + t_float f; + while (n--) { + f=(t_float)c[n][p]; + SETFLOAT (l+n, f); + } } static void readDoubleFromList (int n, t_atom *l, double *f) { Modified: trunk/externals/iem/iemmatrix/src/mtx_rifft.c =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_rifft.c 2008-07-22 15:30:52 UTC (rev 10207) +++ trunk/externals/iem/iemmatrix/src/mtx_rifft.c 2008-07-22 17:23:43 UTC (rev 10208) @@ -33,13 +33,12 @@ int columns_re; int size; int size2; + t_float renorm_fac; #ifdef HAVE_FFTW3_H fftw_plan *fftplan; fftw_complex *f_in; double *f_out; #else - t_float renorm_fac; - t_float *f_re; t_float *f_im; #endif @@ -94,14 +93,24 @@ #ifdef HAVE_FFTW3_H static void readFFTWComplexPartFromList (int n, t_atom *l, fftw_complex *f, enum ComplexPart p) { - for (;n--;f++, l++) - *f[p] = (double) atom_getfloat (l); + for (;n--;) + f[n][p] = (double) atom_getfloat (l+n); } -static void writeDoubleIntoList (int n, t_atom *l, double *f) +static void writeDoubleIntoList (int n, t_atom *l, double *d) { - while (n--) - SETFLOAT (l++,((t_float)(*f++))); + t_float f; + while (n--) { + f=(t_float) d[n]; + SETFLOAT (l+n,f); + } } +static void multiplyDoubleVector (int n, double *f, t_float fac) +{ + double fd=(double)fac; + while (n--) + *f++ *= (double)fd; +} + #endif static void *newMTXRifft (t_symbol *s, int argc, t_atom *argv) @@ -152,6 +161,8 @@ x->fftplan=(fftw_plan*)realloc(x->fftplan,sizeof(fftw_plan)*rows); f_in=(fftw_complex*)realloc(f_in,sizeof(fftw_complex)*size2); f_out=(double*)realloc(f_out,sizeof(double)*size); + list_re=(t_atom*)realloc(list_re, sizeof(t_atom)*(size+2)); + x->list_re = list_re; x->f_out = f_out; x->f_in = f_in; for (ifft_count=0;ifft_count<rows;ifft_count++) { @@ -167,22 +178,20 @@ f_im=(t_float*)realloc(f_im, sizeof(t_float)*size); x->f_re = f_re; x->f_im = f_im; + list_re=(t_atom*)realloc(list_re, sizeof(t_atom)*(size+2)); + x->list_re = list_re; #endif - list_re=(t_atom*)realloc(list_re, sizeof(t_atom)*(size+2)); x->size = size; x->size2 = size2; x->rows = rows; x->columns = columns; x->columns_re = columns_re; - x->list_re = list_re; /* main part: reading imaginary part */ ifft_count = rows; -#ifndef HAVE_FFTW3_H x->renorm_fac = 1.0f / columns; -#endif - while (ifft_count--) { + for (ifft_count=0;ifft_count<rows;ifft_count++) { #ifdef HAVE_FFTW3_H readFFTWComplexPartFromList(columns_re, argv, f_in, IMAGPART); f_in += columns_re; @@ -210,12 +219,11 @@ int ifft_count; #ifdef HAVE_FFTW3_H fftw_complex *f_in = x->f_in; - double *f_out = x->f_out; #else t_float *f_re = x->f_re; t_float *f_im = x->f_im; +#endif t_float renorm_fac = x->renorm_fac; -#endif /* ifftsize check */ if ((rows != x->rows) || @@ -235,7 +243,6 @@ readFloatFromList (columns_re, argv, f_re); ifftPrepareReal (columns, f_re, f_im); mayer_realifft (columns, f_re); - multiplyVector (columns, f_re, renorm_fac); f_im += columns; f_re += columns; #endif @@ -249,8 +256,10 @@ SETFLOAT(x->list_re, rows); SETFLOAT(x->list_re+1, x->columns); #ifdef HAVE_FFTW3_H - writeDoubleIntoList (size, x->list_re+2, f_out); + multiplyDoubleVector (size, x->f_out, renorm_fac); + writeDoubleIntoList (size, x->list_re+2, x->f_out); #else + multiplyVector (size, f_re, renorm_fac); writeFloatIntoList (size, x->list_re+2, f_re); #endif outlet_anything(x->list_re_out, gensym("matrix"), size+2, x->list_re); 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:[10207] trunk/externals/io/aka.wiiremote/aka. wiiremote.c
by eighthave＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 10207 http://pure-data.svn.sourceforge.net/pure-data/?rev=10207&view=rev Author: eighthave Date: 2008-07-22 15:30:52 +0000 (Tue, 22 Jul 2008) Log Message: ----------- removed CFRunLoopRunInMode() in clock function since it doesn't seem to do anything there Modified Paths: -------------- trunk/externals/io/aka.wiiremote/aka.wiiremote.c Modified: trunk/externals/io/aka.wiiremote/aka.wiiremote.c =================================================================== --- trunk/externals/io/aka.wiiremote/aka.wiiremote.c 2008-07-22 15:23:12 UTC (rev 10206) +++ trunk/externals/io/aka.wiiremote/aka.wiiremote.c 2008-07-22 15:30:52 UTC (rev 10207) @@ -538,12 +538,9 @@ t_atom status; connection = wiiremote_isconnected(x->wiiremote); - + if (x->connected == false && connection == true) // if the device is connected... { -#ifdef PD - CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true); -#endif wiiremote_getstatus(x->wiiremote); x->connected = true; SETLONG(&status, 1); 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:[10206] trunk/externals/io/aka.wiiremote
by eighthave＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 10206 http://pure-data.svn.sourceforge.net/pure-data/?rev=10206&view=rev Author: eighthave Date: 2008-07-22 15:23:12 +0000 (Tue, 22 Jul 2008) Log Message: ----------- first working version, bangs now get udpated data properly, but the various other messages don't work, like [motion $1(, [ir $1(, etc. To get it working, I used CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true), which runs the CFRunLoop until just one event has been processed. Modified Paths: -------------- trunk/externals/io/aka.wiiremote/aka.wiiremote.c trunk/externals/io/aka.wiiremote/akawiiremote-help.pd trunk/externals/io/aka.wiiremote/wiiremote.c Modified: trunk/externals/io/aka.wiiremote/aka.wiiremote.c =================================================================== --- trunk/externals/io/aka.wiiremote/aka.wiiremote.c 2008-07-22 15:04:33 UTC (rev 10205) +++ trunk/externals/io/aka.wiiremote/aka.wiiremote.c 2008-07-22 15:23:12 UTC (rev 10206) @@ -10,6 +10,7 @@ #ifdef PD #include "m_pd.h" +#include "m_imp.h" #define SETSYM SETSYMBOL #define SETLONG SETFLOAT #define method t_method @@ -48,12 +49,6 @@ void *dataOut; } t_akawiiremote; -#ifdef PD -static IONotificationPortRef gNotifyPort; -static io_iterator_t gAddedIter; -static CFRunLoopRef gRunLoop; -#endif - void akawiiremote_bang(t_akawiiremote *x); void akawiiremote_address(t_akawiiremote *x, t_symbol *s); void akawiiremote_connect(t_akawiiremote *x); @@ -165,7 +160,9 @@ if (x->wiiremote->device == nil) return; // do nothing - +#ifdef PD + CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true); +#endif if (x->wiiremote->isExpansionPortAttached && x->wiiremote->isExpansionPortEnabled) { // Classic Controller @@ -544,6 +541,9 @@ if (x->connected == false && connection == true) // if the device is connected... { +#ifdef PD + CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true); +#endif wiiremote_getstatus(x->wiiremote); x->connected = true; SETLONG(&status, 1); @@ -595,24 +595,6 @@ first_argument = atom_getsymbolarg(0, ac, av); if(first_argument != &s_) atom_string(av, x->address, MAXPDSTRING-1); - - IOReturn result = kIOReturnSuccess; - mach_port_t masterPort = (mach_port_t) NULL; - result = IOMasterPort (bootstrap_port, &masterPort); - if (kIOReturnSuccess != result) - pd_error(x, "[akawiiremote] IOMasterPort error with bootstrap_port, error %d", result); - else - { - // Create a notification port and add its run loop event source to our run loop - // This is how async notifications get set up. - CFRunLoopSourceRef runLoopSource; - - gNotifyPort = IONotificationPortCreate(masterPort); - runLoopSource = IONotificationPortGetRunLoopSource(gNotifyPort); - - gRunLoop = CFRunLoopGetCurrent(); - CFRunLoopAddSource(gRunLoop, runLoopSource, kCFRunLoopDefaultMode); - } #else /* Max */ t_akawiiremote *x; Modified: trunk/externals/io/aka.wiiremote/akawiiremote-help.pd =================================================================== --- trunk/externals/io/aka.wiiremote/akawiiremote-help.pd 2008-07-22 15:04:33 UTC (rev 10205) +++ trunk/externals/io/aka.wiiremote/akawiiremote-help.pd 2008-07-22 15:23:12 UTC (rev 10206) @@ -50,6 +50,7 @@ #X obj 632 408 pddp/dsp; #X obj 640 500 osc~ 100; #X obj 303 388 akawiiremote; +#X obj 334 589 print; #X connect 0 0 34 0; #X connect 1 0 34 0; #X connect 2 0 22 0; @@ -63,6 +64,7 @@ #X connect 15 0 34 0; #X connect 16 0 34 0; #X connect 19 0 12 0; +#X connect 19 0 35 0; #X connect 19 1 11 0; #X connect 19 2 20 0; #X connect 21 0 34 0; Modified: trunk/externals/io/aka.wiiremote/wiiremote.c =================================================================== --- trunk/externals/io/aka.wiiremote/wiiremote.c 2008-07-22 15:04:33 UTC (rev 10205) +++ trunk/externals/io/aka.wiiremote/wiiremote.c 2008-07-22 15:23:12 UTC (rev 10206) @@ -19,6 +19,7 @@ Boolean requestUpdates(WiiRemoteRef wiiremote); void myEventListener(IOBluetoothL2CAPChannelRef channel, void *refCon, IOBluetoothL2CAPChannelEvent *event); +#define DEBUG(x) //-------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------- @@ -73,6 +74,7 @@ Boolean openCChan(WiiRemoteRef wiiremote) { + DEBUG(post("openCChan");); short i; IOReturn ret; @@ -97,6 +99,7 @@ Boolean openIChan(WiiRemoteRef wiiremote) { + DEBUG(post("openCChan");); short i; IOReturn ret; @@ -208,7 +211,7 @@ void checkDevice(WiiRemoteRef wiiremote, IOBluetoothDeviceRef device) { - post("checkDevice"); + DEBUG(post("checkDevice");); CFStringRef name; CFStringRef address; @@ -234,20 +237,21 @@ void myFoundFunc(void *refCon, IOBluetoothDeviceInquiryRef inquiry, IOBluetoothDeviceRef device) { - post("myFoundFunc"); + DEBUG(post("myFoundFunc");); checkDevice((WiiRemoteRef)refCon, device); } void myUpdatedFunc(void *refCon, IOBluetoothDeviceInquiryRef inquiry, IOBluetoothDeviceRef device, uint32_t devicesRemaining) { - post("myUpdatedFunc"); + DEBUG(post("myUpdatedFunc");); checkDevice((WiiRemoteRef)refCon, device); } void myCompleteFunc(void *refCon, IOBluetoothDeviceInquiryRef inquiry, IOReturn error, Boolean aborted) { - post("myCompleteFunc"); + IOReturn ret; + DEBUG(post("myCompleteFunc");); if (aborted) return; // called by stop ;) @@ -256,8 +260,15 @@ wiiremote_stopsearch((WiiRemoteRef)refCon); return; } +/* + ret = IOBluetoothDeviceInquiryStart(((WiiRemoteRef)refCon)->inquiry); + if (ret != kIOReturnSuccess) + { + wiiremote_stopsearch((WiiRemoteRef)refCon); + } +*/ #ifdef PD - // PD doesn't use the Carbon loop, so we have to manually control it + // PD doesn't use a CFRunLoop, so we have to manually control it CFRunLoopStop( CFRunLoopGetCurrent() ); #endif } @@ -274,7 +285,7 @@ Boolean wiiremote_search(WiiRemoteRef wiiremote, char *address) { - post("wiiremote_search"); + DEBUG(post("wiiremote_search");); IOReturn ret; if (wiiremote->inquiry != nil) @@ -297,14 +308,14 @@ return false; } #ifdef PD - CFRunLoopRun(); // PD doesn't use the Carbon loop, so we have to manually control it + // PD doesn't use a CFRunLoop, so we have to manually control it + CFRunLoopRun(); #endif return true; } Boolean wiiremote_stopsearch(WiiRemoteRef wiiremote) { - post("wiiremote_stopsearch"); IOReturn ret; if (wiiremote->inquiry == nil) @@ -703,6 +714,7 @@ void myDataListener(IOBluetoothL2CAPChannelRef channel, void *dataPointer, UInt16 dataLength, void *refCon) { + DEBUG(post("myDataListener");); WiiRemoteRef wiiremote = (WiiRemoteRef)refCon; unsigned char* dp = (unsigned char*)dataPointer; @@ -738,6 +750,7 @@ void myEventListener(IOBluetoothL2CAPChannelRef channel, void *refCon, IOBluetoothL2CAPChannelEvent *event) { + DEBUG(post("myEventListener");); if (event->eventType == kIOBluetoothL2CAPChannelEventTypeData) { // In thise case: @@ -846,7 +859,7 @@ Boolean wiiremote_disconnect(WiiRemoteRef wiiremote) { - short i = 0; + short i; if (wiiremote->cchan) { 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:[10205] trunk/externals/io/aka.wiiremote/wiiremote.h
by eighthave＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 10205 http://pure-data.svn.sourceforge.net/pure-data/?rev=10205&view=rev Author: eighthave Date: 2008-07-22 15:04:33 +0000 (Tue, 22 Jul 2008) Log Message: ----------- added #define BLUETOOTH_VERSION_USE_CURRENT to get rid of "deprecated" warnings based on this bluetooth-dev post: http://lists.apple.com/archives/Bluetooth-dev/2007/Mar/msg00024.html Modified Paths: -------------- trunk/externals/io/aka.wiiremote/wiiremote.h Modified: trunk/externals/io/aka.wiiremote/wiiremote.h =================================================================== --- trunk/externals/io/aka.wiiremote/wiiremote.h 2008-07-22 14:07:12 UTC (rev 10204) +++ trunk/externals/io/aka.wiiremote/wiiremote.h 2008-07-22 15:04:33 UTC (rev 10205) @@ -2,6 +2,8 @@ // Copyright by Masayuki Akamatsu // Based on "DarwiinRemote" by Hiroaki Kimura +#define BLUETOOTH_VERSION_USE_CURRENT // gets rid of deprecated warnings + #include <CoreFoundation/CoreFoundation.h> #include <IOBluetooth/Bluetooth.h> #include <IOBluetooth/IOBluetoothUserLib.h> 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:[10204] trunk/externals/iem/iemmatrix/src
by zmoelnig＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 10204 http://pure-data.svn.sourceforge.net/pure-data/?rev=10204&view=rev Author: zmoelnig Date: 2008-07-22 14:07:12 +0000 (Tue, 22 Jul 2008) Log Message: ----------- fixing bugs... Modified Paths: -------------- trunk/externals/iem/iemmatrix/src/mtx_rfft.c trunk/externals/iem/iemmatrix/src/mtx_rifft.c Modified: trunk/externals/iem/iemmatrix/src/mtx_rfft.c =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_rfft.c 2008-07-22 13:39:32 UTC (rev 10203) +++ trunk/externals/iem/iemmatrix/src/mtx_rfft.c 2008-07-22 14:07:12 UTC (rev 10204) @@ -15,13 +15,13 @@ #include "iemmatrix.h" #include <stdlib.h> -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H #include <fftw3.h> #endif static t_class *mtx_rfft_class; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H enum ComplexPart { REALPART=0, IMAGPART=1}; #endif @@ -31,7 +31,7 @@ t_object x_obj; int size; int size2; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H int fftn; int rows; fftw_plan *fftplan; @@ -51,7 +51,7 @@ static void deleteMTXRfft (MTXRfft *x) { -#if DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H int n; if (x->fftplan) { for (n=0; n<x->rows; n++) @@ -80,7 +80,7 @@ x->list_re_out = outlet_new (&x->x_obj, gensym("matrix")); x->list_im_out = outlet_new (&x->x_obj, gensym("matrix")); x->size=x->size2=0; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H x->fftn=0; x->rows=0; x->f_in=0; @@ -136,7 +136,7 @@ *f++ = atom_getfloat (l++); } -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H static void writeFFTWComplexPartIntoList (int n, t_atom *l, fftw_complex *f, enum ComplexPart p) { for (;n--;f++, l++) @@ -161,7 +161,7 @@ int fft_count; t_atom *list_re = x->list_re; t_atom *list_im = x->list_im; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H fftw_complex *f_out = x->f_out; double *f_in = x->f_in; #else @@ -181,7 +181,7 @@ /* ok, do the FFT! */ /* memory things */ -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H if ((x->rows!=rows)||(columns!=x->fftn)){ f_out=(fftw_complex*)realloc(f_out, sizeof(fftw_complex)*(size2-2)); f_in=(double*)realloc(f_in, sizeof(double)*size); @@ -190,7 +190,7 @@ for (fft_count=0; fft_count<x->rows; fft_count++) { fftw_destroy_plan(x->fftplan[fft_count]); } - x->fftplan = (fftw_plan*)realloc(x->fftplan, sizeof(fftplan)*rows); + x->fftplan = (fftw_plan*)realloc(x->fftplan, sizeof(fftw_plan)*rows); for (fft_count=0; fft_count<rows; fft_count++, f_in+=columns, f_out+=columns_re) { x->fftplan[fft_count] = fftw_plan_dft_r2c_1d (columns,f_in,f_out,FFTW_ESTIMATE); } @@ -214,7 +214,7 @@ x->list_re = list_re; /* main part */ -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H readDoubleFromList (size, argv, f_in); #else readFloatFromList (size, argv, f_re); @@ -223,7 +223,7 @@ list_re += 2; list_im += 2; for (fft_count=0;fft_count<rows;fft_count++){ -#if DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H fftw_execute(x->fftplan[fft_count]); writeFFTWComplexPartIntoList(columns_re,list_re,f_out,REALPART); writeFFTWComplexPartIntoList(columns_re,list_im,f_out,IMAGPART); Modified: trunk/externals/iem/iemmatrix/src/mtx_rifft.c =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_rifft.c 2008-07-22 13:39:32 UTC (rev 10203) +++ trunk/externals/iem/iemmatrix/src/mtx_rifft.c 2008-07-22 14:07:12 UTC (rev 10204) @@ -15,13 +15,13 @@ #include "iemmatrix.h" #include <stdlib.h> -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H #include <fftw3.h> #endif static t_class *mtx_rifft_class; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H enum ComplexPart { REALPART=0, IMAGPART=1}; #endif @@ -33,7 +33,7 @@ int columns_re; int size; int size2; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H fftw_plan *fftplan; fftw_complex *f_in; double *f_out; @@ -91,7 +91,7 @@ *++re = -*--im; } -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H static void readFFTWComplexPartFromList (int n, t_atom *l, fftw_complex *f, enum ComplexPart p) { for (;n--;f++, l++) @@ -114,9 +114,9 @@ static void mTXRifftMatrixCold (MTXRifft *x, t_symbol *s, - int argc, t_atom *argv) + int argc, t_atom *argv) { - int rows = atom_getint (argv++); + int rows = atom_getint (argv++); int columns_re = atom_getint (argv++); int in_size = argc-2; int columns = (columns_re-1)<<1; @@ -124,7 +124,7 @@ int size = rows * columns; int ifft_count; t_atom *list_re = x->list_re; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H fftw_complex *f_in = x->f_in; double *f_out = x->f_out; #else @@ -144,24 +144,24 @@ else if (columns == (1 << ilog2(columns))) { /* memory things */ -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H if ((x->rows!=rows)||(columns!=x->columns)){ - for (ifft_count=0;ifft_count<rows;ifft_count++) { - fftw_destroy_plan(x->fftplan[ifft_count]); - } - x->fftplan=(fftw_plan*)realloc(x->fftplan,sizeof(fftw_plan)*rows); - f_in=(fftw_complex*)realloc(f_in,sizeof(fftw_complex)*size2); - f_out=(double*)realloc(f_out,sizeof(double)*size); - x->f_out = f_out; - x->f_in = f_in; - for (ifft_count=0;ifft_count<rows;ifft_count++) { - x->fftplan[ifft_count]=fftw_plan_dft_c2r_1d(columns,f_in,f_out,FFTW_ESTIMATE); - f_out+=columns; - f_in+=columns_re; - } - f_in=x->f_in; - f_out=x->f_out; - } + for (ifft_count=0;ifft_count<x->rows;ifft_count++) { + fftw_destroy_plan(x->fftplan[ifft_count]); + } + x->fftplan=(fftw_plan*)realloc(x->fftplan,sizeof(fftw_plan)*rows); + f_in=(fftw_complex*)realloc(f_in,sizeof(fftw_complex)*size2); + f_out=(double*)realloc(f_out,sizeof(double)*size); + x->f_out = f_out; + x->f_in = f_in; + for (ifft_count=0;ifft_count<rows;ifft_count++) { + x->fftplan[ifft_count]=fftw_plan_dft_c2r_1d(columns,f_in,f_out,FFTW_ESTIMATE); + f_out+=columns; + f_in+=columns_re; + } + f_in=x->f_in; + f_out=x->f_out; + } #else f_re=(t_float*)realloc(f_re, sizeof(t_float)*size); f_im=(t_float*)realloc(f_im, sizeof(t_float)*size); @@ -179,11 +179,11 @@ /* main part: reading imaginary part */ ifft_count = rows; -#ifndef DHAVE_FFTW3 +#ifndef HAVE_FFTW3_H x->renorm_fac = 1.0f / columns; #endif while (ifft_count--) { -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H readFFTWComplexPartFromList(columns_re, argv, f_in, IMAGPART); f_in += columns_re; #else @@ -199,7 +199,7 @@ } static void mTXRifftMatrixHot (MTXRifft *x, t_symbol *s, - int argc, t_atom *argv) + int argc, t_atom *argv) { int rows = atom_getint (argv++); int columns_re = atom_getint (argv++); @@ -208,7 +208,7 @@ int in_size = argc-2; int size2 = x->size2; int ifft_count; -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H fftw_complex *f_in = x->f_in; double *f_out = x->f_out; #else @@ -227,9 +227,9 @@ post("mtx_rifft: invalid right side matrix"); else { /* main part */ for (ifft_count=0;ifft_count<rows;ifft_count++){ -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H readFFTWComplexPartFromList(columns_re,argv,f_in,REALPART); - fftw_execute(x->fftw_execute[ifft_count]); + fftw_execute(x->fftplan[ifft_count]); f_in+=columns_re; #else readFloatFromList (columns_re, argv, f_re); @@ -241,18 +241,17 @@ #endif argv += columns_re; } -#ifndef DHAVE_FFTW3 +#ifndef HAVE_FFTW3_H f_re = x->f_re; #endif size2 = x->size2; - SETSYMBOL(x->list_re, gensym("matrix")); SETFLOAT(x->list_re, rows); SETFLOAT(x->list_re+1, x->columns); -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H writeDoubleIntoList (size, x->list_re+2, f_out); #else - writeFloatIntoList (size, x->list_re+2, f_re); + writeFloatIntoList (size, x->list_re+2, f_re); #endif outlet_anything(x->list_re_out, gensym("matrix"), size+2, x->list_re); } @@ -262,33 +261,33 @@ { if (x->list_re) outlet_anything(x->list_re_out, gensym("matrix"), - x->size+2, x->list_re); + x->size+2, x->list_re); } static void deleteMTXRifft (MTXRifft *x) { -#ifdef DHAVE_FFTW3 +#ifdef HAVE_FFTW3_H int n; if (x->fftplan) { - for (n=0; n<x->rows; n++) - fftw_destroy_plan(x->fftplan[n]); - free(x->fftplan); + for (n=0; n<x->rows; n++) + fftw_destroy_plan(x->fftplan[n]); + free(x->fftplan); } if (x->f_out) - free(x->f_out); + free(x->f_out); if (x->f_in) - free(x->f_in); + free(x->f_in); #else if (x->f_re) - free(x->f_re); + free(x->f_re); if (x->f_im) - free(x->f_im); + free(x->f_im); #endif if (x->list_re) - free(x->list_re); + free(x->list_re); if (x->list_im) - free(x->list_im); + free(x->list_im); } static void mtx_rifft_setup (void) 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:[10203] trunk/externals/iem/iemmatrix/src
by zmoelnig＠users.sourceforge.net 22 Jul '08

22 Jul '08

Revision: 10203 http://pure-data.svn.sourceforge.net/pure-data/?rev=10203&view=rev Author: zmoelnig Date: 2008-07-22 13:39:32 +0000 (Tue, 22 Jul 2008) Log Message: ----------- added check for fftw3; use config.h for extended configuration Modified Paths: -------------- trunk/externals/iem/iemmatrix/src/configure.ac trunk/externals/iem/iemmatrix/src/iemmatrix.h Added Paths: ----------- trunk/externals/iem/iemmatrix/src/config.h.in Added: trunk/externals/iem/iemmatrix/src/config.h.in =================================================================== --- trunk/externals/iem/iemmatrix/src/config.h.in (rev 0) +++ trunk/externals/iem/iemmatrix/src/config.h.in 2008-07-22 13:39:32 UTC (rev 10203) @@ -0,0 +1,10 @@ +#ifndef CONFIG_H_ +#define CONFIG_H_ + + +/* do we have fftw3 installed? */ +#undef HAVE_FFTW3_H + + + +#endif /* CONFIG_H_ */ Modified: trunk/externals/iem/iemmatrix/src/configure.ac =================================================================== --- trunk/externals/iem/iemmatrix/src/configure.ac 2008-07-22 13:20:18 UTC (rev 10202) +++ trunk/externals/iem/iemmatrix/src/configure.ac 2008-07-22 13:39:32 UTC (rev 10203) @@ -1,7 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(iemmatrix.c) +AC_CONFIG_HEADER(config.h) +DFLAGS="${DFLAGS} -DHAVE_CONFIG_H" + + dnl Checks for programs. AC_PROG_CC @@ -63,7 +67,7 @@ dnl Replace `main' with a function in -lpthread: dnl AC_CHECK_LIB(pthread, main) dnl Replace `main' with a function in -lstk: -dnl AC_CHECK_LIB(stk, main, STK=yes) +AC_CHECK_LIB(fftw3, fftw_destroy_plan) if test "x$with_pd" != "x"; then @@ -92,7 +96,7 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h) +AC_CHECK_HEADERS(stdlib.h stdio.h string.h math.h time.h sys/time.h fftw3.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_HEADER_TIME @@ -208,7 +212,7 @@ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -shared -rdata_shared" EXT=pd_irix6 - dnl DFLAGS="-DUNIX -DIRIX6" + dnl DFLAGS="-DUNIX -DIRIX6 ${DFLAGS}" STRIPFLAGS="--strip-unneeded" if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); @@ -224,7 +228,7 @@ LDFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared" EXT=pd_irix5 - dnl DFLAGS="-DUNIX -DIRIX5" + dnl DFLAGS="-DUNIX -DIRIX5 ${DFLAGS}" STRIPFLAGS="--strip-unneeded" if test "$enable_lpt" = "yes"; then AC_MSG_ERROR("lpt not supported on this platform"); Modified: trunk/externals/iem/iemmatrix/src/iemmatrix.h =================================================================== --- trunk/externals/iem/iemmatrix/src/iemmatrix.h 2008-07-22 13:20:18 UTC (rev 10202) +++ trunk/externals/iem/iemmatrix/src/iemmatrix.h 2008-07-22 13:39:32 UTC (rev 10203) @@ -53,6 +53,11 @@ #include "m_pd.h" + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + #define VERSION "0.1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs July 2008