From 761af5cdd6f924577f0fc6af351039d2c35dcb7b Mon Sep 17 00:00:00 2001 From: Thomas O Fredericks Date: Fri, 23 Oct 2009 13:46:24 +0000 Subject: Modified paramRoutes behavior with a bad message svn path=/trunk/externals/tof/; revision=12651 --- src/param.c | 24 ++++++------------------ src/paramCustom.h | 4 +++- src/paramDump.h | 4 ++-- src/paramFile.h | 4 +++- src/paramGui.h | 34 ++++++++++++++++++++-------------- src/paramId.h | 4 +++- src/paramRoute.h | 7 +++++-- src/tof.h | 4 +++- 8 files changed, 45 insertions(+), 40 deletions(-) (limited to 'src') diff --git a/src/param.c b/src/param.c index 2eaf4e1..88fbb91 100644 --- a/src/param.c +++ b/src/param.c @@ -300,6 +300,9 @@ static void* paramClass_new(t_symbol *s, int ac, t_atom *av) inlet_new((t_object *)x, (t_pd *)p, 0, 0); x->outlet = outlet_new(&x->x_obj, &s_list); + + + return (x); } @@ -352,24 +355,6 @@ static void* param_new(t_symbol *s, int argc, t_atom *argv) { void param_setup(void) { - - /* - alist_setup(); - list_append_setup(); - list_prepend_setup(); - list_split_setup(); - list_trim_setup(); - list_length_setup(); - class_addcreator((t_newmethod)list_new, &s_list, A_GIMME, 0); - */ - - /* - - - - */ - ///////////// - // SETUP THE PARAM CLASS param_class = class_new(gensym("param /"), @@ -387,6 +372,7 @@ void param_setup(void) class_addanything(param_inlet2_class, paramClass_inlet2_anything); + class_sethelpsymbol(param_class,gensym("param")); // SETUP OTHER CLASSES paramCustom_setup(); @@ -401,4 +387,6 @@ void param_setup(void) class_addcreator((t_newmethod)param_new, gensym("param"), A_GIMME, 0); class_addcreator((t_newmethod)param_new, gensym("tof/param"), A_GIMME, 0); + + } diff --git a/src/paramCustom.h b/src/paramCustom.h index 9d34f83..b8c8ee7 100644 --- a/src/paramCustom.h +++ b/src/paramCustom.h @@ -182,7 +182,7 @@ static void* paramCustom_new(t_symbol *s, int ac, t_atom *av) void paramCustom_setup(void) { - paramCustom_class = class_new(gensym("paramCustom"), + paramCustom_class = class_new(gensym("param custom"), (t_newmethod)paramCustom_new, (t_method)paramCustom_free, sizeof(t_paramCustom), 0, A_GIMME, 0); @@ -197,4 +197,6 @@ void paramCustom_setup(void) class_addanything(paramCustom_receive_class, paramCustom_receive_anything); + class_sethelpsymbol(paramCustom_class,gensym("param")); + } diff --git a/src/paramDump.h b/src/paramDump.h index 2d00f13..878b8c5 100644 --- a/src/paramDump.h +++ b/src/paramDump.h @@ -151,7 +151,7 @@ static void *paramDump_new(t_symbol *s, int ac, t_atom *av) { } void paramDump_setup(void) { - paramDump_class = class_new(gensym("paramDump"), + paramDump_class = class_new(gensym("param dump"), (t_newmethod)paramDump_new, (t_method)paramDump_free, sizeof(t_paramDump), 0, A_GIMME, 0); @@ -163,7 +163,7 @@ void paramDump_setup(void) { class_addmethod(paramDump_class, (t_method) paramDump_guis, gensym("guis"), A_DEFSYMBOL,0); //class_addmethod(paramDump_class, (t_method) paramDump_updateguis, gensym("updateguis"), A_DEFSYMBOL,0); - + class_sethelpsymbol(paramDump_class,gensym("param")); //class_addmethod(paramDump_class, (t_method) paramDump_update_guis, gensym("update"), A_DEFSYMBOL,0); } diff --git a/src/paramFile.h b/src/paramFile.h index a835df6..42d568b 100644 --- a/src/paramFile.h +++ b/src/paramFile.h @@ -246,7 +246,7 @@ static void* paramFile_new(t_symbol *s, int ac, t_atom *av) { void paramFile_setup(void) { - paramFile_class = class_new(gensym("paramFile"), + paramFile_class = class_new(gensym("param file"), (t_newmethod)paramFile_new, (t_method)paramFile_free, sizeof(t_paramFile), 0, A_GIMME, 0); @@ -259,6 +259,8 @@ void paramFile_setup(void) { class_addbang(paramFile_inlet2_class, paramFile_inlet2_bang); class_addfloat(paramFile_inlet2_class, paramFile_inlet2_float); + class_sethelpsymbol(paramFile_class,gensym("param")); + //class_addmethod(paramFile_class, (t_method) paramFile_load, gensym("load"), A_DEFFLOAT,0); //class_addmethod(paramFile_class, (t_method) paramFile_float, gensym("save"), A_DEFFLOAT,0); diff --git a/src/paramGui.h b/src/paramGui.h index fdfaf33..a825d62 100644 --- a/src/paramGui.h +++ b/src/paramGui.h @@ -238,6 +238,16 @@ static void paramGui_free(t_paramGui *x) x->childcanvas = NULL; } +/* +static void paramGui_properties(t_gobj*z, t_glist*owner) { + t_iemguts_objlist*objs=objectsInCanvas((t_pd*)z); + while(objs) { + t_propertybang*x=(t_propertybang*)objs->obj; + propertybang_bang(x); + objs=objs->next; + } +} +*/ static void *paramGui_new(t_symbol *s, int ac, t_atom *av) { t_paramGui *x = (t_paramGui *)pd_new(paramGui_class); @@ -289,16 +299,7 @@ static void *paramGui_new(t_symbol *s, int ac, t_atom *av) { // From this point on, we are hoping the "pd" object has been created x->childcanvas = (t_canvas*) pd_newest(); - /* - // Change saved name to match pd's canvas naming scheme - int pdcanvasname_len = strlen(x->fullpath->s_name ) + 4; - char* pdcanvasname = getbytes(pdcanvasname_len * sizeof(*pdcanvasname)); - strcpy(pdcanvasname,"pd-"); - strcat(pdcanvasname,x->fullpath->s_name); - x->canvasname = gensym(pdcanvasname); - freebytes(pdcanvasname,pdcanvasname_len * sizeof(*pdcanvasname)); - */ - + // Hide the window (stupid way of doing this) if (x->childcanvas) { @@ -306,18 +307,21 @@ static void *paramGui_new(t_symbol *s, int ac, t_atom *av) { pd_typedmess((t_pd*)x->childcanvas,gensym("vis"),1,&a); } - - //x->outlet = outlet_new(&x->x_obj, &s_list); - inlet_new(&x->x_obj, &x->x_obj.ob_pd,gensym("bang"), gensym("reset")); + + + // SET THE PROPERTIES FUNCTION + //t_class *class = ((t_gobj*)currentcanvas)->g_pd; + //class_setpropertiesfn(class, propertybang_properties); + return (x); } void paramGui_setup(void) { - paramGui_class = class_new(gensym("paramGui"), + paramGui_class = class_new(gensym("param gui"), (t_newmethod)paramGui_new, (t_method)paramGui_free, sizeof(t_paramGui), 0, A_GIMME, 0); @@ -326,6 +330,8 @@ void paramGui_setup(void) { class_addmethod(paramGui_class, (t_method) paramGui_reset, gensym("reset"), 0); + + class_sethelpsymbol(paramGui_class,gensym("param")); //class_addmethod(paramGui_class, (t_method) paramGui_guis, gensym("guis"), A_DEFSYMBOL,0); //class_addmethod(paramGui_class, (t_method) paramGui_updateguis, gensym("updateguis"), A_DEFSYMBOL,0); diff --git a/src/paramId.h b/src/paramId.h index d36167b..c11ec22 100644 --- a/src/paramId.h +++ b/src/paramId.h @@ -43,10 +43,12 @@ static void *paramId_new(t_symbol *s, int ac, t_atom *av) { } void paramId_setup(void) { - paramId_class = class_new(gensym("paramId"), + paramId_class = class_new(gensym("param id"), (t_newmethod)paramId_new, (t_method)paramId_free, sizeof(t_paramId), 0, A_GIMME, 0); class_addbang(paramId_class, paramId_bang); + class_sethelpsymbol(paramId_class, gensym("param")); + } diff --git a/src/paramRoute.h b/src/paramRoute.h index f284c29..a17d1a9 100644 --- a/src/paramRoute.h +++ b/src/paramRoute.h @@ -62,7 +62,8 @@ static void paramRoute_anything(t_paramRoute *x, t_symbol *s, int ac, t_atom *av outlet_anything(x->x_outlet,path,ac,av); } } else { - pd_error(x,"Target name must start with a \"/\""); + outlet_anything(x->x_outlet,path,ac,av); + //pd_error(x,"Target name must start with a \"/\""); } } @@ -101,10 +102,12 @@ static void *paramRoute_new(t_symbol *s, int ac, t_atom *av) { } void paramRoute_setup(void) { - paramRoute_class = class_new(gensym("paramRoute"), + paramRoute_class = class_new(gensym("param route"), (t_newmethod)paramRoute_new, (t_method)paramRoute_free, sizeof(t_paramRoute), 0, A_GIMME, 0); class_addanything(paramRoute_class, paramRoute_anything); + class_sethelpsymbol(paramRoute_class, gensym("param")); + } diff --git a/src/tof.h b/src/tof.h index 9681d7e..f6d2eba 100644 --- a/src/tof.h +++ b/src/tof.h @@ -47,7 +47,9 @@ static int tof_canvas_is_not_subpatch(t_canvas* canvas) { static t_canvas* tof_get_canvas(void) { - return canvas_getcurrent(); + t_glist *glist=(t_glist *)canvas_getcurrent(); + + return (t_canvas*)glist_getcanvas(glist); //return glist_getcanvas((t_glist *)canvas_getcurrent()); } -- cgit v1.2.1