Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6387
Modified Files:
Tag: desiredata
desire.c kernel.c m_pd.h
Log Message:
class_addmethod3 renamed to class_addmethod2, etc
Index: m_pd.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
retrieving revision 1.4.4.11.2.33.2.33
retrieving revision 1.4.4.11.2.33.2.34
diff -C2 -d -r1.4.4.11.2.33.2.33 -r1.4.4.11.2.33.2.34
*** m_pd.h 4 Jan 2007 17:29:34 -0000 1.4.4.11.2.33.2.33
--- m_pd.h 4 Jan 2007 18:25:13 -0000 1.4.4.11.2.33.2.34
***************
*** 296,301 ****
EXTERN void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv);
EXTERN void pd_forwardmess(t_pd *x, int argc, t_atom *argv);
! EXTERN t_symbol *gensym(char *s);
! EXTERN t_symbol *gensym2(char *s, size_t n);
EXTERN t_gotfn getfn(t_pd *x, t_symbol *s);
EXTERN t_gotfn zgetfn(t_pd *x, t_symbol *s);
--- 296,301 ----
EXTERN void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv);
EXTERN void pd_forwardmess(t_pd *x, int argc, t_atom *argv);
! EXTERN t_symbol *gensym(const char *s);
! EXTERN t_symbol *gensym2(const char *s, size_t n);
EXTERN t_gotfn getfn(t_pd *x, t_symbol *s);
EXTERN t_gotfn zgetfn(t_pd *x, t_symbol *s);
***************
*** 484,492 ****
EXTERN t_class *class_find (t_symbol *s);
EXTERN t_class *class_new( t_symbol *name,t_newmethod nu,t_method free,size_t size,int flags,t_atomtypearg arg1, ...);
! EXTERN t_class *class_new2(t_symbol *name,t_newmethod nu,t_method free,size_t size,int flags,const char *sig);
EXTERN void class_addcreator( t_newmethod nu, t_symbol *sel, t_atomtypearg arg1, ...);
! EXTERN void class_addcreator2(t_symbol *name, t_newmethod nu, t_symbol *original_name, const char *sig);
EXTERN void class_addmethod( t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...);
! EXTERN void class_addmethod2( t_class *c, t_method fn, t_symbol *sel, const char *sig);
EXTERN void class_addbang( t_class *c, t_method fn);
EXTERN void class_addpointer( t_class *c, t_method fn);
--- 484,496 ----
EXTERN t_class *class_find (t_symbol *s);
EXTERN t_class *class_new( t_symbol *name,t_newmethod nu,t_method free,size_t size,int flags,t_atomtypearg arg1, ...);
! EXTERN t_class *class_new2(const char *name,t_newmethod nu,t_method free,size_t size,int flags,const char *sig);
EXTERN void class_addcreator( t_newmethod nu, t_symbol *sel, t_atomtypearg arg1, ...);
! EXTERN void class_addcreator2(const char *name, t_newmethod nu, const char *original_name, const char *sig);
EXTERN void class_addmethod( t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...);
! EXTERN void class_addmethod2( t_class *c, t_method fn, const char *sel, const char *sig);
! #define class_new2(NAME,NU,FREE,SIZE,FLAGS,SIG) class_new2(NAME,(t_newmethod)NU,(t_method)FREE,SIZE,FLAGS,SIG)
! #define class_addcreator2(NAME,NU,ORIG,SIG) class_addcreator2(NAME,(t_newmethod)NU,ORIG,SIG)
! #define class_addmethod2(NAME,METH,SEL,SIG) class_addmethod2(NAME,(t_method)METH,SEL,SIG)
!
EXTERN void class_addbang( t_class *c, t_method fn);
EXTERN void class_addpointer( t_class *c, t_method fn);
***************
*** 514,523 ****
#ifndef PD_CLASS_DEF
! #define class_addbang(x, y) class_addbang((x), (t_method)(y))
! #define class_addpointer(x, y) class_addpointer((x), (t_method)(y))
! #define class_addfloat(x, y) class_doaddfloat((x), (t_method)(y))
! #define class_addsymbol(x, y) class_addsymbol((x), (t_method)(y))
! #define class_addstring(x, y) class_addstring((x), (t_method)(y)) /* for future use */
! #define class_addlist(x, y) class_addlist((x), (t_method)(y))
#define class_addanything(x, y) class_addanything((x), (t_method)(y))
#endif
--- 518,527 ----
#ifndef PD_CLASS_DEF
! #define class_addbang(x, y) class_addbang( (x), (t_method)(y))
! #define class_addpointer(x, y) class_addpointer( (x), (t_method)(y))
! #define class_addfloat(x, y) class_doaddfloat( (x), (t_method)(y))
! #define class_addsymbol(x, y) class_addsymbol( (x), (t_method)(y))
! #define class_addstring(x, y) class_addstring( (x), (t_method)(y)) /* for future use */
! #define class_addlist(x, y) class_addlist( (x), (t_method)(y))
#define class_addanything(x, y) class_addanything((x), (t_method)(y))
#endif
Index: kernel.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -C2 -d -r1.1.2.27 -r1.1.2.28
*** kernel.c 4 Jan 2007 17:29:34 -0000 1.1.2.27
--- kernel.c 4 Jan 2007 18:25:13 -0000 1.1.2.28
***************
*** 1036,1047 ****
}
/* Note that some classes such as "select", are actually two classes of the same name,
one for the single-argument form, one for the multiple one; see select_setup() to
find out how this is handled. */
! t_class *class_new2(t_symbol *s, t_newmethod newmethod, t_method freemethod,
size_t size, int flags, const char *sig) {
! #ifdef QUALIFIED_NAME
! t_symbol *S=gensym(s->name);
! #endif
int typeflag = flags & CLASS_TYPEMASK;
if (!typeflag) typeflag = CLASS_PATCHABLE;
--- 1036,1049 ----
}
+ #undef class_new2
+ #undef class_addcreator2
+ #undef class_addmethod2
+
/* Note that some classes such as "select", are actually two classes of the same name,
one for the single-argument form, one for the multiple one; see select_setup() to
find out how this is handled. */
! t_class *class_new2(const char *ss, t_newmethod newmethod, t_method freemethod,
size_t size, int flags, const char *sig) {
! t_symbol *s = gensym(ss);
int typeflag = flags & CLASS_TYPEMASK;
if (!typeflag) typeflag = CLASS_PATCHABLE;
***************
*** 1051,1055 ****
if (pd_objectmaker._class && newmethod) {
/* add a "new" method by the name specified by the object */
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, s, sig);
if (class_loadsym) {
/* if we're loading an extern it might have been invoked by a
--- 1053,1057 ----
if (pd_objectmaker._class && newmethod) {
/* add a "new" method by the name specified by the object */
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, s->name, sig);
if (class_loadsym) {
/* if we're loading an extern it might have been invoked by a
***************
*** 1057,1061 ****
char *loadstring = class_loadsym->name, l1 = strlen(s->name), l2 = strlen(loadstring);
if (l2 > l1 && !strcmp(s->name, loadstring + (l2 - l1)))
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, class_loadsym, sig);
}
}
--- 1059,1063 ----
char *loadstring = class_loadsym->name, l1 = strlen(s->name), l2 = strlen(loadstring);
if (l2 > l1 && !strcmp(s->name, loadstring + (l2 - l1)))
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, class_loadsym->name, sig);
}
}
***************
*** 1083,1090 ****
c->savefn = (typeflag == CLASS_PATCHABLE ? text_save : class_nosavefn);
#ifdef QUALIFIED_NAME
! c->helpname = S;
// like a class_addcreator
if (pd_library_name && newmethod)
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, S, sig);
#endif
hash_set(class_table, c->name, c);
--- 1085,1092 ----
c->savefn = (typeflag == CLASS_PATCHABLE ? text_save : class_nosavefn);
#ifdef QUALIFIED_NAME
! c->helpname = gensym(ss);
// like a class_addcreator
if (pd_library_name && newmethod)
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, ss, sig);
#endif
hash_set(class_table, c->name, c);
***************
*** 1096,1109 ****
can belong to, but this won't be used until the newmethod is actually
called back (and the new method explicitly takes care of this.) */
! void class_addcreator2(t_symbol *s, t_newmethod newmethod, t_symbol *original_name, const char *sig) {
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, s, sig);
#ifdef QUALIFIED_NAME
! if (pd_library_name) s = qualified_name(s);
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, s, sig);
#endif
hash_set(class_table,s,0);
}
! void class_addmethod2(t_class *c, t_method fn, t_symbol *sel, const char *fmt) {
t_methodentry *m;
int argtype = *fmt++;
--- 1098,1112 ----
can belong to, but this won't be used until the newmethod is actually
called back (and the new method explicitly takes care of this.) */
! void class_addcreator2(const char *ss, t_newmethod newmethod, const char *original_name, const char *sig) {
! t_symbol *s = gensym(ss);
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, ss, sig);
#ifdef QUALIFIED_NAME
! class_addmethod2(pd_objectmaker._class, (t_method)newmethod, pd_library_name ? qualified_name(s)->name : ss, sig);
#endif
hash_set(class_table,s,0);
}
! void class_addmethod2(t_class *c, t_method fn, const char *ss, const char *fmt) {
! t_symbol *sel = gensym(ss);
t_methodentry *m;
int argtype = *fmt++;
***************
*** 1167,1171 ****
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); return class_new2(s,newmethod,freemethod,size,flags,fmt);
}
void class_addcreator(t_newmethod newmethod, t_symbol *s, t_atomtypearg arg1, ...) {
--- 1170,1174 ----
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); return class_new2(s->name,newmethod,freemethod,size,flags,fmt);
}
void class_addcreator(t_newmethod newmethod, t_symbol *s, t_atomtypearg arg1, ...) {
***************
*** 1176,1180 ****
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); class_addcreator2(s,newmethod,0,fmt);
}
void class_addmethod(t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...) {
--- 1179,1183 ----
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); class_addcreator2(s->name,newmethod,0,fmt);
}
void class_addmethod(t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...) {
***************
*** 1185,1189 ****
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); class_addmethod2(c,fn,sel,fmt);
}
--- 1188,1192 ----
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); class_addmethod2(c,fn,sel->name,fmt);
}
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.110
retrieving revision 1.1.2.217.2.111
diff -C2 -d -r1.1.2.217.2.110 -r1.1.2.217.2.111
*** desire.c 4 Jan 2007 04:58:25 -0000 1.1.2.217.2.110
--- desire.c 4 Jan 2007 18:25:10 -0000 1.1.2.217.2.111
***************
*** 2157,2184 ****
static void g_array_setup(void) {
! t_class *c = garray_class = class_new(gensym("array"), 0, (t_method)garray_free,
! sizeof(t_garray), CLASS_GOBJ, 0);
! array_class = class_new(gensym("array_really"), 0, (t_method)array_free,
! sizeof(t_array), CLASS_GOBJ, 0);
! class_addmethod3(c, garray_const, "const", "F");
class_addlist(garray_class, garray_list);
! class_addmethod3(c, garray_bounds, "bounds", "ffff");
! class_addmethod3(c, garray_xticks, "xticks", "fff");
! class_addmethod3(c, garray_xlabel, "xlabel", "*");
! class_addmethod3(c, garray_yticks, "yticks", "fff");
! class_addmethod3(c, garray_ylabel, "ylabel", "*");
! class_addmethod3(c, garray_rename, "rename", "s");
! class_addmethod3(c, garray_read, "read", "s");
! class_addmethod3(c, garray_write, "write", "s");
! class_addmethod3(c, garray_resize, "resize", "f");
! class_addmethod3(c, garray_print, "print", "");
! class_addmethod3(c, garray_sinesum, "sinesum", "*");
! class_addmethod3(c, garray_cosinesum, "cosinesum", "*");
! class_addmethod3(c, garray_normalize, "normalize", "F");
! class_addmethod3(c, garray_arraydialog, "arraydialog", "sfff");
! class_addmethod3(c, garray_arrayviewlist_new, "arrayviewlistnew", "");
! class_addmethod3(c, garray_arrayviewlist_fillpage, "arrayviewlistfillpage", "fF");
! class_addmethod3(c, garray_arrayviewlist_close, "arrayviewclose", "");
! class_setsavefn(garray_class, garray_save);
}
--- 2157,2182 ----
static void g_array_setup(void) {
! t_class *c = garray_class = class_new2("array",0,garray_free,sizeof(t_garray),CLASS_GOBJ,"");
class_addlist(garray_class, garray_list);
! class_addmethod2(c, garray_const, "const", "F");
! class_addmethod2(c, garray_bounds, "bounds", "ffff");
! class_addmethod2(c, garray_xticks, "xticks", "fff");
! class_addmethod2(c, garray_xlabel, "xlabel", "*");
! class_addmethod2(c, garray_yticks, "yticks", "fff");
! class_addmethod2(c, garray_ylabel, "ylabel", "*");
! class_addmethod2(c, garray_rename, "rename", "s");
! class_addmethod2(c, garray_read, "read", "s");
! class_addmethod2(c, garray_write, "write", "s");
! class_addmethod2(c, garray_resize, "resize", "f");
! class_addmethod2(c, garray_print, "print", "");
! class_addmethod2(c, garray_sinesum, "sinesum", "*");
! class_addmethod2(c, garray_cosinesum, "cosinesum", "*");
! class_addmethod2(c, garray_normalize, "normalize", "F");
! class_addmethod2(c, garray_arraydialog, "arraydialog", "sfff");
! class_addmethod2(c, garray_arrayviewlist_new, "arrayviewlistnew", "");
! class_addmethod2(c, garray_arrayviewlist_fillpage, "arrayviewlistfillpage", "fF");
! class_addmethod2(c, garray_arrayviewlist_close, "arrayviewclose", "");
! class_setsavefn(c, garray_save);
! array_class = class_new2("array_really",0,array_free,sizeof(t_array),CLASS_GOBJ,"");
}
***************
*** 3306,3312 ****
static void vinlet_setup(void) {
! t_class *c = vinlet_class = class_new(gensym("inlet"), (t_newmethod)vinlet_new,
! (t_method)vinlet_free, sizeof(t_vinlet), CLASS_NOINLET, A_DEFSYM, 0);
! class_addcreator((t_newmethod)vinlet_newsig, gensym("inlet~"), A_DEFSYM, 0);
class_addbang( c, vinlet_bang);
class_addpointer( c, vinlet_pointer);
--- 3304,3309 ----
static void vinlet_setup(void) {
! t_class *c = vinlet_class = class_new2("inlet",vinlet_new,vinlet_free,sizeof(t_vinlet),CLASS_NOINLET,"S");
! class_addcreator2("inlet~",vinlet_newsig,"inlet","S");
class_addbang( c, vinlet_bang);
class_addpointer( c, vinlet_pointer);
***************
*** 3315,3319 ****
class_addlist( c, vinlet_list);
class_addanything(c, vinlet_anything);
! class_addmethod3( c, vinlet_dsp, "dsp", "");
class_sethelpsymbol(c, gensym("pd"));
}
--- 3312,3316 ----
class_addlist( c, vinlet_list);
class_addanything(c, vinlet_anything);
! class_addmethod2( c, vinlet_dsp,"dsp","");
class_sethelpsymbol(c, gensym("pd"));
}
***************
*** 3548,3554 ****
static void voutlet_setup(void) {
! t_class *c = voutlet_class = class_new(gensym("outlet"), (t_newmethod)voutlet_new,
! (t_method)voutlet_free, sizeof(t_voutlet), CLASS_NOINLET, A_DEFSYM, 0);
! class_addcreator((t_newmethod)voutlet_newsig, gensym("outlet~"), A_DEFSYM, 0);
class_addbang( c, voutlet_bang);
class_addpointer( c, voutlet_pointer);
--- 3545,3550 ----
static void voutlet_setup(void) {
! t_class *c = voutlet_class = class_new2("outlet",voutlet_new,voutlet_free,sizeof(t_voutlet),CLASS_NOINLET,"S");
! class_addcreator2("outlet~",voutlet_newsig,"outlet~","S");
class_addbang( c, voutlet_bang);
class_addpointer( c, voutlet_pointer);
***************
*** 3557,3561 ****
class_addlist( c, voutlet_list);
class_addanything(c, voutlet_anything);
! class_addmethod3( c, voutlet_dsp, "dsp", "");
class_sethelpsymbol(c, gensym("pd"));
}
--- 3553,3557 ----
class_addlist( c, voutlet_list);
class_addanything(c, voutlet_anything);
! class_addmethod2( c, voutlet_dsp, "dsp", "");
class_sethelpsymbol(c, gensym("pd"));
}
***************
*** 3784,3788 ****
static void g_scalar_setup(void) {
! scalar_class = class_new(gensym("scalar"), 0, (t_method)scalar_free, 0, CLASS_GOBJ, 0);
class_setsavefn(scalar_class, scalar_save);
}
--- 3780,3784 ----
static void g_scalar_setup(void) {
! scalar_class = class_new2("scalar",0,scalar_free,0,CLASS_GOBJ,"");
class_setsavefn(scalar_class, scalar_save);
}
***************
*** 5047,5072 ****
static void g_template_setup(void) {
! template_class = class_new(gensym("template"), 0, (t_method)template_free,
! sizeof(t_template), CLASS_PD, 0);
! class_addmethod3(pd_canvasmaker._class, template_usetemplate, "struct", "*");
! gtemplate_class = class_new(gensym("struct"), (t_newmethod)gtemplate_new, (t_method)gtemplate_free,
! sizeof(t_gtemplate), CLASS_NOINLET, A_GIMME, 0);
! class_addcreator((t_newmethod)gtemplate_new_old, gensym("template"), A_GIMME, 0);
! curve_class = class_new(gensym("drawpolygon"), (t_newmethod)curve_new,
! (t_method)curve_free, sizeof(t_curve), 0, A_GIMME, 0);
class_setdrawcommand(curve_class);
! class_addcreator((t_newmethod)curve_new, gensym("drawcurve"), A_GIMME, 0);
! class_addcreator((t_newmethod)curve_new, gensym("filledpolygon"), A_GIMME, 0);
! class_addcreator((t_newmethod)curve_new, gensym("filledcurve"), A_GIMME, 0);
class_addfloat(curve_class, curve_float);
! plot_class = class_new(gensym("plot"), (t_newmethod)plot_new, 0, sizeof(t_plot), 0, A_GIMME, 0);
class_setdrawcommand(plot_class);
class_addfloat(plot_class, plot_float);
! drawnumber_class = class_new(gensym("drawnumber"),
! (t_newmethod)drawnumber_new, (t_method)drawnumber_free, sizeof(t_drawnumber), 0, A_GIMME, 0);
class_setdrawcommand(drawnumber_class);
class_addfloat(drawnumber_class, drawnumber_float);
! class_addcreator((t_newmethod)drawnumber_new, gensym("drawsymbol"), A_GIMME, 0);
}
--- 5043,5064 ----
static void g_template_setup(void) {
! template_class = class_new2("template",0,template_free,sizeof(t_template),CLASS_PD,"");
! class_addmethod2(pd_canvasmaker._class, template_usetemplate, "struct", "*");
! gtemplate_class = class_new2("struct",gtemplate_new,gtemplate_free,sizeof(t_gtemplate),CLASS_NOINLET,"*");
! class_addcreator2("template",gtemplate_new_old,0,"*");
! curve_class = class_new2("drawpolygon",curve_new,curve_free,sizeof(t_curve),0,"*");
class_setdrawcommand(curve_class);
! class_addcreator2("drawcurve", curve_new,0,"*");
! class_addcreator2("filledpolygon",curve_new,0,"*");
! class_addcreator2("filledcurve", curve_new,0,"*");
class_addfloat(curve_class, curve_float);
! plot_class = class_new2("plot",plot_new,0,sizeof(t_plot),0,"*");
class_setdrawcommand(plot_class);
class_addfloat(plot_class, plot_float);
! drawnumber_class = class_new2("drawnumber",drawnumber_new,drawnumber_free,sizeof(t_drawnumber),0,"*");
class_setdrawcommand(drawnumber_class);
class_addfloat(drawnumber_class, drawnumber_float);
! class_addcreator2("drawsymbol",drawnumber_new,0,"*");
}
***************
*** 5637,5678 ****
static void g_traversal_setup(void) {
! t_class *c = ptrobj_class = class_new(gensym("pointer"), (t_newmethod)ptrobj_new,
! (t_method)ptrobj_free, sizeof(t_ptrobj), 0, A_GIMME, 0);
! class_addmethod3(c, ptrobj_traverse,"traverse", "s");
! class_addmethod3(c, ptrobj_next,"next","");
! class_addmethod3(c, ptrobj_vnext,"vnext","F");
! class_addmethod3(c, ptrobj_sendwindow,"send-window","*");
! class_addmethod3(c, ptrobj_rewind, "rewind","");
class_addpointer(c, ptrobj_pointer);
class_addbang(c, ptrobj_bang);
!
! get_class = class_new(gensym("get"), (t_newmethod)get_new,
! (t_method)get_free, sizeof(t_get), 0, A_GIMME, 0);
class_addpointer(get_class, get_pointer);
!
! set_class = class_new(gensym("set"), (t_newmethod)set_new,
! (t_method)set_free, sizeof(t_set), 0, A_GIMME, 0);
class_addfloat(set_class, set_float);
class_addsymbol(set_class, set_symbol);
class_addbang(set_class, set_bang);
!
! elem_class = class_new(gensym("element"), (t_newmethod)elem_new,
! (t_method)elem_free, sizeof(t_elem), 0, A_DEFSYM, A_DEFSYM, 0);
class_addfloat(elem_class, elem_float);
!
! getsize_class = class_new(gensym("getsize"), (t_newmethod)getsize_new, 0,
! sizeof(t_getsize), 0, A_DEFSYM, A_DEFSYM, 0);
class_addpointer(getsize_class, getsize_pointer);
!
! setsize_class = class_new(gensym("setsize"), (t_newmethod)setsize_new,
! (t_method)setsize_free, sizeof(t_setsize), 0, A_DEFSYM, A_DEFSYM, A_DEFFLOAT, 0);
class_addfloat(setsize_class, setsize_float);
!
! append_class = class_new(gensym("append"), (t_newmethod)append_new,
! (t_method)append_free, sizeof(t_append), 0, A_GIMME, 0);
class_addfloat(append_class, append_float);
!
! sublist_class = class_new(gensym("sublist"), (t_newmethod)sublist_new,
! (t_method)sublist_free, sizeof(t_sublist), 0, A_DEFSYM, A_DEFSYM, 0);
class_addpointer(sublist_class, sublist_pointer);
}
--- 5629,5655 ----
static void g_traversal_setup(void) {
! t_class *c = ptrobj_class = class_new2("pointer",ptrobj_new,ptrobj_free,sizeof(t_ptrobj),0,"*");
! class_addmethod2(c, ptrobj_traverse,"traverse", "s");
! class_addmethod2(c, ptrobj_next,"next","");
! class_addmethod2(c, ptrobj_vnext,"vnext","F");
! class_addmethod2(c, ptrobj_sendwindow,"send-window","*");
! class_addmethod2(c, ptrobj_rewind, "rewind","");
class_addpointer(c, ptrobj_pointer);
class_addbang(c, ptrobj_bang);
! get_class = class_new2("get",get_new,get_free,sizeof(t_get),0,"*");
class_addpointer(get_class, get_pointer);
! set_class = class_new2("set",set_new,set_free,sizeof(t_set),0,"*");
class_addfloat(set_class, set_float);
class_addsymbol(set_class, set_symbol);
class_addbang(set_class, set_bang);
! elem_class = class_new2("element",elem_new,elem_free,sizeof(t_elem),0,"SS");
class_addfloat(elem_class, elem_float);
! getsize_class = class_new2("getsize",getsize_new,0,sizeof(t_getsize),0,"SS");
class_addpointer(getsize_class, getsize_pointer);
! setsize_class = class_new2("setsize",setsize_new,setsize_free,sizeof(t_setsize),0,"SSFF");
class_addfloat(setsize_class, setsize_float);
! append_class = class_new2("append",append_new,append_free,sizeof(t_append),0,"*");
class_addfloat(append_class, append_float);
! sublist_class = class_new2("sublist",sublist_new,sublist_free,sizeof(t_sublist),0,"SS");
class_addpointer(sublist_class, sublist_pointer);
}
***************
*** 6181,6188 ****
static void g_text_setup(void) {
t_class *c;
! text_class = class_new(gensym("text"), 0, 0, sizeof(t_text), CLASS_NOINLET|CLASS_PATCHABLE, 0);
! dummy_class = class_new(gensym("dummy"), 0, 0, sizeof(t_text), CLASS_NOINLET|CLASS_PATCHABLE, 0);
! c = mresp_class = class_new(gensym("messresponder"), 0, 0, sizeof(t_text), CLASS_PD, 0);
class_addbang( c, mresp_bang);
class_addfloat( c, (t_method) mresp_float);
--- 6158,6165 ----
static void g_text_setup(void) {
t_class *c;
! text_class = class_new2("text", 0,0,sizeof(t_text),CLASS_NOINLET|CLASS_PATCHABLE,0);
! dummy_class = class_new2("dummy",0,0,sizeof(t_text),CLASS_NOINLET|CLASS_PATCHABLE,0);
! c = mresp_class = class_new2("messresponder",0,0,sizeof(t_text),CLASS_PD,"");
class_addbang( c, mresp_bang);
class_addfloat( c, (t_method) mresp_float);
***************
*** 6191,6195 ****
class_addanything(c, mresp_anything);
! c = message_class = class_new(gensym("message"), 0,0, sizeof(t_message), CLASS_PATCHABLE, 0);
class_addbang(c, message_bang);
class_addfloat(c, message_float);
--- 6168,6172 ----
class_addanything(c, mresp_anything);
! c = message_class = class_new2("message",0,0,sizeof(t_message),CLASS_PATCHABLE,"");
class_addbang(c, message_bang);
class_addfloat(c, message_float);
***************
*** 6197,6216 ****
class_addlist(c, message_list);
class_addanything(c, message_list);
! class_addmethod3(c, message_set, "set","*");
! class_addmethod3(c, message_add, "add","*");
! class_addmethod3(c, message_add2,"add2","*");
! class_addmethod3(c, message_addcomma, "addcomma", "");
! class_addmethod3(c, message_addsemi, "addsemi", "");
! class_addmethod3(c, message_adddollar, "adddollar", "f");
! class_addmethod3(c, message_adddollsym, "adddollsym","s");
! c = gatom_class = class_new(gensym("gatom"), 0, (t_method)gatom_free,
! sizeof(t_gatom), CLASS_NOINLET | CLASS_PATCHABLE, 0);
class_addbang(c, gatom_bang);
class_addfloat(c, gatom_float);
class_addsymbol(c, gatom_symbol);
class_addlist(c, gatom_list);
! class_addmethod3(c, gatom_set, "set","*");
! class_addmethod3(c, gatom_reload, "reload","*");
}
--- 6174,6192 ----
class_addlist(c, message_list);
class_addanything(c, message_list);
! class_addmethod2(c, message_set, "set","*");
! class_addmethod2(c, message_add, "add","*");
! class_addmethod2(c, message_add2,"add2","*");
! class_addmethod2(c, message_addcomma, "addcomma", "");
! class_addmethod2(c, message_addsemi, "addsemi", "");
! class_addmethod2(c, message_adddollar, "adddollar", "f");
! class_addmethod2(c, message_adddollsym, "adddollsym","s");
! c = gatom_class = class_new2("gatom",0,gatom_free,sizeof(t_gatom),CLASS_NOINLET|CLASS_PATCHABLE,"");
class_addbang(c, gatom_bang);
class_addfloat(c, gatom_float);
class_addsymbol(c, gatom_symbol);
class_addlist(c, gatom_list);
! class_addmethod2(c, gatom_set, "set","*");
! class_addmethod2(c, gatom_reload, "reload","*");
}
***************
*** 6492,6503 ****
static void iemgui_subclass (t_class *c) {
! class_addmethod3(c, iemgui_delta, "delta","*");
! class_addmethod3(c, iemgui_pos, "pos","*");
! class_addmethod3(c, iemgui_color, "color","*");
! class_addmethod3(c, iemgui_send, "send","S");
! class_addmethod3(c, iemgui_receive, "receive","S");
! class_addmethod3(c, iemgui_label, "label","S");
! class_addmethod3(c, iemgui_label_pos, "label_pos","ff");
! class_addmethod3(c, iemgui_label_font, "label_font","*");
}
--- 6468,6479 ----
static void iemgui_subclass (t_class *c) {
! class_addmethod2(c, iemgui_delta, "delta","*");
! class_addmethod2(c, iemgui_pos, "pos","*");
! class_addmethod2(c, iemgui_color, "color","*");
! class_addmethod2(c, iemgui_send, "send","S");
! class_addmethod2(c, iemgui_receive, "receive","S");
! class_addmethod2(c, iemgui_label, "label","S");
! class_addmethod2(c, iemgui_label_pos, "label_pos","ff");
! class_addmethod2(c, iemgui_label_font, "label_font","*");
}
***************
*** 7328,7404 ****
static void g_canvas_setup(void) {
! reply_class = class_new(gensym("reply"), 0,
! (t_method)reply_free, sizeof(t_reply), CLASS_GOBJ, A_CANT, 0);
// class_setsavefn(reply_class, (t_savefn)reply_savefn);
! declare_class = class_new(gensym("declare"), (t_newmethod)declare_new,
! (t_method)declare_free, sizeof(t_declare), CLASS_NOINLET, A_GIMME, 0);
!
! /* we prevent the user from typing "canvas" in an object box
! by sending 0 for a creator function. */
! t_class *c = canvas_class = class_new(gensym("canvas"), 0,
! (t_method)canvas_free, sizeof(t_canvas), CLASS_NOINLET, 0);
/* here is the real creator function, invoked in patch files
by sending the "canvas" message to #N, which is bound to pd_canvasmaker. */
! class_addmethod3(pd_canvasmaker._class,canvas_new,"canvas","*");
! class_addmethod3(c,canvas_restore,"restore","*");
! class_addmethod3(c,canvas_coords,"coords","*");
! class_addmethod3(c,canvas_obj,"obj","*");
! class_addmethod3(c,canvas_msg,"msg","*");
! class_addmethod3(c,canvas_floatatom,"floatatom","*");
! class_addmethod3(c,canvas_symbolatom,"symbolatom","*");
! class_addmethod3(c,canvas_text,"text","*");
! class_addmethod3(c,canvas_canvas,"graph","*");
! class_addmethod3(c,canvas_scalar,"scalar","*");
!
! class_addmethod3(c,canvas_declare,"declare","*");
!
! class_addmethod3(c,canvas_push,"push","");
! class_addmethod3(c,canvas_pop,"pop","F");
! class_addmethod3(c,canvas_loadbang,"loadbang","");
! class_addmethod3(c,canvas_relocate,"relocate","ss");
! class_addmethod3(c,canvas_vis,"vis","f");
! class_addmethod3(c,canvas_menu_open,"menu-open","");
! class_addmethod3(c,canvas_map,"map","f");
!
! class_addmethod3(c,canvas_clear,"clear","");
class_addcreator((t_newmethod)subcanvas_new, gensym("pd"), A_DEFSYMBOL, 0);
class_addcreator((t_newmethod)subcanvas_new, gensym("page"), A_DEFSYMBOL, 0);
! class_addmethod3(c,canvas_dsp,"dsp","");
! class_addmethod3(c,canvas_rename_method,"rename","*");
class_addcreator((t_newmethod)table_new, gensym("table"), A_DEFSYM, A_DEFFLOAT, 0);
!
! class_addmethod3(c,canvas_close,"close","F");
!
! class_addmethod3(c,canvas_find, "find","*");
! class_addmethod3(c,canvas_find_again, "findagain","");
! class_addmethod3(c,canvas_find_parent,"findparent","");
! class_addmethod3(c,canvas_arraydialog,"arraydialog","sfff");
! class_addmethod3(c,canvas_connect,"connect","ffff");
! class_addmethod3(c,canvas_disconnect,"disconnect","ffff");
!
! class_addmethod3(c,canvas_write,"write","sS");
! class_addmethod3(c,canvas_read, "read","sS");
! class_addmethod3(c,canvas_mergefile, "mergefile","sS");
! class_addmethod3(c,canvas_savetofile,"savetofile","ss");
! class_addmethod3(c,canvas_saveto, "saveto","!");
!
! class_addmethod3(c,graph_bounds,"bounds","ffff");
! class_addmethod3(c,graph_xticks,"xticks","fff");
! class_addmethod3(c,graph_xlabel,"xlabel","*");
! class_addmethod3(c,graph_yticks,"yticks","fff");
! class_addmethod3(c,graph_ylabel,"ylabel","*");
! class_addmethod3(c,graph_array,"array","sfsF");
! class_addmethod3(c,canvas_sort,"sort","");
!
// dd-specific
! class_addmethod3(c,canvas_object_moveto,"object_moveto","sff");
! class_addmethod3(c,canvas_object_delete,"object_delete","s");
! class_addmethod3(c,canvas_object_insert,"object_insert","*");
! class_addmethod3(c,canvas_object_get_tips,"object_get_tips","s");
! class_addmethod3(c,canvas_object_help,"object_help","s");
! class_addmethod3(c,canvas_text_setto,"text_setto","*");
! class_addmethod3(c,canvas_with_reply,"with_reply","*");
! class_addmethod3(pd_canvasmaker._class,canvas_with_reply,"with_reply","*");
class_setnotice(c, canvas_notice);
}
--- 7304,7366 ----
static void g_canvas_setup(void) {
! reply_class = class_new2("reply",0,reply_free,sizeof(t_reply),CLASS_GOBJ,"!");
// class_setsavefn(reply_class, (t_savefn)reply_savefn);
! declare_class = class_new2("declare",declare_new,declare_free,sizeof(t_declare),CLASS_NOINLET,"*");
! t_class *c = canvas_class = class_new2("canvas",0,canvas_free,sizeof(t_canvas),CLASS_NOINLET,"");
/* here is the real creator function, invoked in patch files
by sending the "canvas" message to #N, which is bound to pd_canvasmaker. */
! class_addmethod2(pd_canvasmaker._class,canvas_new,"canvas","*");
! class_addmethod2(c,canvas_restore,"restore","*");
! class_addmethod2(c,canvas_coords,"coords","*");
! class_addmethod2(c,canvas_obj,"obj","*");
! class_addmethod2(c,canvas_msg,"msg","*");
! class_addmethod2(c,canvas_floatatom,"floatatom","*");
! class_addmethod2(c,canvas_symbolatom,"symbolatom","*");
! class_addmethod2(c,canvas_text,"text","*");
! class_addmethod2(c,canvas_canvas,"graph","*");
! class_addmethod2(c,canvas_scalar,"scalar","*");
! class_addmethod2(c,canvas_declare,"declare","*");
! class_addmethod2(c,canvas_push,"push","");
! class_addmethod2(c,canvas_pop,"pop","F");
! class_addmethod2(c,canvas_loadbang,"loadbang","");
! class_addmethod2(c,canvas_relocate,"relocate","ss");
! class_addmethod2(c,canvas_vis,"vis","f");
! class_addmethod2(c,canvas_menu_open,"menu-open","");
! class_addmethod2(c,canvas_map,"map","f");
! class_addmethod2(c,canvas_clear,"clear","");
class_addcreator((t_newmethod)subcanvas_new, gensym("pd"), A_DEFSYMBOL, 0);
class_addcreator((t_newmethod)subcanvas_new, gensym("page"), A_DEFSYMBOL, 0);
! class_addmethod2(c,canvas_dsp,"dsp","");
! class_addmethod2(c,canvas_rename_method,"rename","*");
class_addcreator((t_newmethod)table_new, gensym("table"), A_DEFSYM, A_DEFFLOAT, 0);
! class_addmethod2(c,canvas_close,"close","F");
! class_addmethod2(c,canvas_find, "find","*");
! class_addmethod2(c,canvas_find_again, "findagain","");
! class_addmethod2(c,canvas_find_parent,"findparent","");
! class_addmethod2(c,canvas_arraydialog,"arraydialog","sfff");
! class_addmethod2(c,canvas_connect,"connect","ffff");
! class_addmethod2(c,canvas_disconnect,"disconnect","ffff");
! class_addmethod2(c,canvas_write,"write","sS");
! class_addmethod2(c,canvas_read, "read","sS");
! class_addmethod2(c,canvas_mergefile, "mergefile","sS");
! class_addmethod2(c,canvas_savetofile,"savetofile","ss");
! class_addmethod2(c,canvas_saveto, "saveto","!");
! class_addmethod2(c,graph_bounds,"bounds","ffff");
! class_addmethod2(c,graph_xticks,"xticks","fff");
! class_addmethod2(c,graph_xlabel,"xlabel","*");
! class_addmethod2(c,graph_yticks,"yticks","fff");
! class_addmethod2(c,graph_ylabel,"ylabel","*");
! class_addmethod2(c,graph_array,"array","sfsF");
! class_addmethod2(c,canvas_sort,"sort","");
// dd-specific
! class_addmethod2(c,canvas_object_moveto,"object_moveto","sff");
! class_addmethod2(c,canvas_object_delete,"object_delete","s");
! class_addmethod2(c,canvas_object_insert,"object_insert","*");
! class_addmethod2(c,canvas_object_get_tips,"object_get_tips","s");
! class_addmethod2(c,canvas_object_help,"object_help","s");
! class_addmethod2(c,canvas_text_setto,"text_setto","*");
! class_addmethod2(c,canvas_with_reply,"with_reply","*");
! class_addmethod2(pd_canvasmaker._class,canvas_with_reply,"with_reply","*");
class_setnotice(c, canvas_notice);
}
***************
*** 7512,7520 ****
class_addlist (c, bng_bang2);
class_addanything(c, bng_bang2);
! class_addmethod3(c,bng_reload,"reload","*");
! class_addmethod3(c,bng_loadbang,"loadbang","");
! class_addmethod3(c,bng_size,"size","*");
! class_addmethod3(c,bng_flashtime,"flashtime","*");
! class_addmethod3(c,iemgui_init,"init","f");
class_setsavefn(c, (t_savefn)bng_savefn);
class_sethelpsymbol(c, gensym("bng"));
--- 7474,7482 ----
class_addlist (c, bng_bang2);
class_addanything(c, bng_bang2);
! class_addmethod2(c,bng_reload,"reload","*");
! class_addmethod2(c,bng_loadbang,"loadbang","");
! class_addmethod2(c,bng_size,"size","*");
! class_addmethod2(c,bng_flashtime,"flashtime","*");
! class_addmethod2(c,iemgui_init,"init","f");
class_setsavefn(c, (t_savefn)bng_savefn);
class_sethelpsymbol(c, gensym("bng"));
***************
*** 7527,7536 ****
class_addbang(c, toggle_bang);
class_addfloat(c, toggle_float);
! class_addmethod3(c,toggle_reload,"reload","*");
! class_addmethod3(c,toggle_loadbang,"loadbang","");
! class_addmethod3(c,toggle_set,"set","f");
! class_addmethod3(c,toggle_size,"size","*");
! class_addmethod3(c,iemgui_init,"init","f");
! class_addmethod3(c,toggle_nonzero,"nonzero","f");
class_setsavefn(c, (t_savefn)toggle_savefn);
class_sethelpsymbol(c, gensym("toggle"));
--- 7489,7498 ----
class_addbang(c, toggle_bang);
class_addfloat(c, toggle_float);
! class_addmethod2(c,toggle_reload,"reload","*");
! class_addmethod2(c,toggle_loadbang,"loadbang","");
! class_addmethod2(c,toggle_set,"set","f");
! class_addmethod2(c,toggle_size,"size","*");
! class_addmethod2(c,iemgui_init,"init","f");
! class_addmethod2(c,toggle_nonzero,"nonzero","f");
class_setsavefn(c, (t_savefn)toggle_savefn);
class_sethelpsymbol(c, gensym("toggle"));
***************
*** 7541,7554 ****
class_addbang(c, radio_bang);
class_addfloat(c, radio_float);
! class_addmethod3(c,radio_reload, "reload","*");
! class_addmethod3(c,radio_loadbang, "loadbang","");
! class_addmethod3(c,radio_set, "set","f");
! class_addmethod3(c,radio_size, "size","f");
! class_addmethod3(c,iemgui_init, "init","f");
! class_addmethod3(c,radio_fout, "fout","f");
! class_addmethod3(c,radio_number, "number","f");
! class_addmethod3(c,radio_orient,"orient","f");
! class_addmethod3(c,radio_single_change, "single_change","");
! class_addmethod3(c,radio_double_change, "double_change","");
sym_hdl = gensym("hdl"); sym_hradio = gensym("hradio");
sym_vdl = gensym("vdl"); sym_vradio = gensym("vradio");
--- 7503,7516 ----
class_addbang(c, radio_bang);
class_addfloat(c, radio_float);
! class_addmethod2(c,radio_reload, "reload","*");
! class_addmethod2(c,radio_loadbang, "loadbang","");
! class_addmethod2(c,radio_set, "set","f");
! class_addmethod2(c,radio_size, "size","f");
! class_addmethod2(c,iemgui_init, "init","f");
! class_addmethod2(c,radio_fout, "fout","f");
! class_addmethod2(c,radio_number, "number","f");
! class_addmethod2(c,radio_orient,"orient","f");
! class_addmethod2(c,radio_single_change, "single_change","");
! class_addmethod2(c,radio_double_change, "double_change","");
sym_hdl = gensym("hdl"); sym_hradio = gensym("hradio");
sym_vdl = gensym("vdl"); sym_vradio = gensym("vradio");
***************
*** 7573,7586 ****
class_addbang(c,slider_bang);
class_addfloat(c,slider_float);
! class_addmethod3(c,slider_reload,"reload","*");
! class_addmethod3(c,slider_loadbang,"loadbang","");
! class_addmethod3(c,slider_set,"set","f");
! class_addmethod3(c,slider_size,"size","*");
! class_addmethod3(c,slider_range,"range","ff");
! class_addmethod3(c,slider_log,"log","");
! class_addmethod3(c,slider_lin,"lin","");
! class_addmethod3(c,iemgui_init,"init","f");
! class_addmethod3(c,slider_steady,"steady","f");
! class_addmethod3(c,slider_orient,"orient","f");
sym_vsl = gensym("vsl");
sym_vslider = gensym("vslider");
--- 7535,7548 ----
class_addbang(c,slider_bang);
class_addfloat(c,slider_float);
! class_addmethod2(c,slider_reload,"reload","*");
! class_addmethod2(c,slider_loadbang,"loadbang","");
! class_addmethod2(c,slider_set,"set","f");
! class_addmethod2(c,slider_size,"size","*");
! class_addmethod2(c,slider_range,"range","ff");
! class_addmethod2(c,slider_log,"log","");
! class_addmethod2(c,slider_lin,"lin","");
! class_addmethod2(c,iemgui_init,"init","f");
! class_addmethod2(c,slider_steady,"steady","f");
! class_addmethod2(c,slider_orient,"orient","f");
sym_vsl = gensym("vsl");
sym_vslider = gensym("vslider");
***************
*** 7595,7607 ****
class_addfloat(c,nbx_float);
class_addlist(c, nbx_list);
! class_addmethod3(c,nbx_reload,"reload","*");
! class_addmethod3(c,nbx_loadbang,"loadbang","");
! class_addmethod3(c,nbx_set,"set","f");
! class_addmethod3(c,nbx_size,"size","*");
! class_addmethod3(c,nbx_range,"range","*");
! class_addmethod3(c,nbx_log,"log","");
! class_addmethod3(c,nbx_lin,"lin","");
! class_addmethod3(c,iemgui_init,"init","f");
! class_addmethod3(c,nbx_log_height,"log_height","f");
class_setsavefn(c,(t_savefn)nbx_savefn);
class_sethelpsymbol(c, gensym("numbox2"));
--- 7557,7569 ----
class_addfloat(c,nbx_float);
class_addlist(c, nbx_list);
! class_addmethod2(c,nbx_reload,"reload","*");
! class_addmethod2(c,nbx_loadbang,"loadbang","");
! class_addmethod2(c,nbx_set,"set","f");
! class_addmethod2(c,nbx_size,"size","*");
! class_addmethod2(c,nbx_range,"range","*");
! class_addmethod2(c,nbx_log,"log","");
! class_addmethod2(c,nbx_lin,"lin","");
! class_addmethod2(c,iemgui_init,"init","f");
! class_addmethod2(c,nbx_log_height,"log_height","f");
class_setsavefn(c,(t_savefn)nbx_savefn);
class_sethelpsymbol(c, gensym("numbox2"));
***************
*** 7610,7617 ****
(t_method)iemgui_free, sizeof(t_cnv), CLASS_NOINLET, A_GIMME, 0);
class_addcreator((t_newmethod)cnv_new, gensym("cnv"), A_GIMME, 0);
! class_addmethod3(c,cnv_reload,"reload","*");
! class_addmethod3(c,cnv_size,"size","*");
! class_addmethod3(c,cnv_vis_size,"vis_size","*");
! class_addmethod3(c,cnv_get_pos,"get_pos","");
iemgui_subclass(c);
class_setsavefn(c,(t_savefn)cnv_savefn);
--- 7572,7579 ----
(t_method)iemgui_free, sizeof(t_cnv), CLASS_NOINLET, A_GIMME, 0);
class_addcreator((t_newmethod)cnv_new, gensym("cnv"), A_GIMME, 0);
! class_addmethod2(c,cnv_reload,"reload","*");
! class_addmethod2(c,cnv_size,"size","*");
! class_addmethod2(c,cnv_vis_size,"vis_size","*");
! class_addmethod2(c,cnv_get_pos,"get_pos","");
iemgui_subclass(c);
class_setsavefn(c,(t_savefn)cnv_savefn);
***************
*** 7622,7629 ****
class_addbang(c,vu_bang);
class_addfloat(c,vu_float0);
! class_addmethod3(c,vu_float1,"ft1","f");
! class_addmethod3(c,vu_reload,"reload","*");
! class_addmethod3(c,vu_size,"size","*");
! class_addmethod3(c,vu_scale,"scale","F");
class_setsavefn(c,(t_savefn)vu_savefn);
class_sethelpsymbol(c, gensym("vu"));
--- 7584,7591 ----
class_addbang(c,vu_bang);
class_addfloat(c,vu_float0);
! class_addmethod2(c,vu_float1,"ft1","f");
! class_addmethod2(c,vu_reload,"reload","*");
! class_addmethod2(c,vu_size,"size","*");
! class_addmethod2(c,vu_scale,"scale","F");
class_setsavefn(c,(t_savefn)vu_savefn);
class_sethelpsymbol(c, gensym("vu"));
***************
*** 7634,7638 ****
class_addbang(c, dropper_bang);
class_addsymbol(c, dropper_symbol);
! class_addmethod3(c,dropper_reload,"reload","*");
class_setsavefn(c, (t_savefn)dropper_savefn);
class_sethelpsymbol(c, gensym("dropper"));
--- 7596,7600 ----
class_addbang(c, dropper_bang);
class_addsymbol(c, dropper_symbol);
! class_addmethod2(c,dropper_reload,"reload","*");
class_setsavefn(c, (t_savefn)dropper_savefn);
class_sethelpsymbol(c, gensym("dropper"));
***************
*** 7775,7779 ****
extern t_class *glob_pdobject;
extern "C" void glob_init(void) {
-
maxclass = class_new(gensym("max"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL);
class_addanything(maxclass, max_default);
--- 7737,7740 ----
***************
*** 7782,7833 ****
/* this smells bad... a conflict with [pd] subpatches */
t_class *c = glob_pdobject = class_new(gensym("pd"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL);
!
! class_addmethod3(c,glob_initfromgui, "init", "*");
! class_addmethod3(c,glob_setfilename, "filename", "ss");
! class_addmethod3(c,glob_evalfile, "open", "ss");
! class_addmethod3(c,glob_quit, "quit", "");
! class_addmethod3(c,glob_dsp, "dsp", "*");
! class_addmethod3(c,glob_meters, "meters", "f");
! class_addmethod3(c,glob_audiostatus, "audiostatus", "");
! class_addmethod3(c,glob_finderror, "finderror", "");
! class_addmethod3(c,glob_audio_properties, "audio-properties", "F");
! class_addmethod3(c,glob_audio_dialog, "audio-dialog", "*");
! class_addmethod3(c,glob_audio_setapi, "audio-setapi", "f");
! class_addmethod3(c,glob_midi_setapi, "midi-setapi", "f");
! class_addmethod3(c,glob_midi_properties, "midi-properties", "F");
! class_addmethod3(c,glob_midi_dialog, "midi-dialog", "*");
! class_addmethod3(c,glob_ping, "ping","");
/* tb: message-based audio configuration { */
! // class_addmethod3(c,glob_audio_samplerate, "audio-samplerate", "F");
! // class_addmethod3(c,glob_audio_delay, "audio-delay", "F");
! // class_addmethod3(c,glob_audio_dacblocksize,"audio-dacblocksize", "F");
! // class_addmethod3(c,glob_audio_scheduler, "audio-scheduler", "F");
! class_addmethod3(c,glob_audio_device, "audio-device", "*");
! // class_addmethod3(c,glob_audio_device_in, "audio-device-in", "*");
! // class_addmethod3(c,glob_audio_device_out, "audio-device-out", "*");
! class_addmethod3(c,glob_audio_getaudioindevices, "getaudioindev", "*");
! class_addmethod3(c,glob_audio_getaudiooutdevices,"getaudiooutdev", "*");
! class_addmethod3(c,glob_audio_getaudioininfo, "getaudioininfo", "f");
! class_addmethod3(c,glob_audio_getaudiooutinfo, "getaudiooutinfo", "f");
! class_addmethod3(c,glob_audio_testaudiosetting, "testaudiosetting", "*");
! class_addmethod3(c,glob_audio_getcurrent_devices,"getaudiodevice", "");
! class_addmethod3(c,glob_audio_asio_latencies, "getasiolatencies", "F");
! class_addmethod3(c,glob_midi_getoutdevs,"getmidioutdev", "*");
! class_addmethod3(c,glob_midi_getindevs, "getmidiindev", "*");
! class_addmethod3(c,glob_midi_getcurrentoutdevs, "getmidicurrentoutdev", "");
! class_addmethod3(c,glob_midi_getcurrentindevs, "getmidicurrentindev", "");
/* tb } */
-
#ifdef UNIX
! class_addmethod3(c,glob_watchdog, "watchdog", "");
#endif
! class_addmethod3(c,glob_update_class_list, "update-class-list", "ss");
! class_addmethod3(c,glob_update_class_info, "update-class-info", "sss");
! class_addmethod3(c,glob_update_path, "update-path", "");
! class_addmethod3(c,glob_help, "help", "s");
! class_addmethod3(c,glob_redraw, "redraw", "");
!
! class_addmethod3(c,glob_object_table,"object_table","");
!
class_addanything(c, max_default);
pd_bind((t_pd *)&glob_pdobject, gensym("pd"));
--- 7743,7790 ----
/* this smells bad... a conflict with [pd] subpatches */
t_class *c = glob_pdobject = class_new(gensym("pd"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL);
! class_addmethod2(c,glob_initfromgui, "init", "*");
! class_addmethod2(c,glob_setfilename, "filename", "ss");
! class_addmethod2(c,glob_evalfile, "open", "ss");
! class_addmethod2(c,glob_quit, "quit", "");
! class_addmethod2(c,glob_dsp, "dsp", "*");
! class_addmethod2(c,glob_meters, "meters", "f");
! class_addmethod2(c,glob_audiostatus, "audiostatus", "");
! class_addmethod2(c,glob_finderror, "finderror", "");
! class_addmethod2(c,glob_audio_properties, "audio-properties", "F");
! class_addmethod2(c,glob_audio_dialog, "audio-dialog", "*");
! class_addmethod2(c,glob_audio_setapi, "audio-setapi", "f");
! class_addmethod2(c,glob_midi_setapi, "midi-setapi", "f");
! class_addmethod2(c,glob_midi_properties, "midi-properties", "F");
! class_addmethod2(c,glob_midi_dialog, "midi-dialog", "*");
! class_addmethod2(c,glob_ping, "ping","");
/* tb: message-based audio configuration { */
! // class_addmethod2(c,glob_audio_samplerate, "audio-samplerate", "F");
! // class_addmethod2(c,glob_audio_delay, "audio-delay", "F");
! // class_addmethod2(c,glob_audio_dacblocksize,"audio-dacblocksize", "F");
! // class_addmethod2(c,glob_audio_scheduler, "audio-scheduler", "F");
! class_addmethod2(c,glob_audio_device, "audio-device", "*");
! // class_addmethod2(c,glob_audio_device_in, "audio-device-in", "*");
! // class_addmethod2(c,glob_audio_device_out, "audio-device-out", "*");
! class_addmethod2(c,glob_audio_getaudioindevices, "getaudioindev", "*");
! class_addmethod2(c,glob_audio_getaudiooutdevices,"getaudiooutdev", "*");
! class_addmethod2(c,glob_audio_getaudioininfo, "getaudioininfo", "f");
! class_addmethod2(c,glob_audio_getaudiooutinfo, "getaudiooutinfo", "f");
! class_addmethod2(c,glob_audio_testaudiosetting, "testaudiosetting", "*");
! class_addmethod2(c,glob_audio_getcurrent_devices,"getaudiodevice", "");
! class_addmethod2(c,glob_audio_asio_latencies, "getasiolatencies", "F");
! class_addmethod2(c,glob_midi_getoutdevs,"getmidioutdev", "*");
! class_addmethod2(c,glob_midi_getindevs, "getmidiindev", "*");
! class_addmethod2(c,glob_midi_getcurrentoutdevs, "getmidicurrentoutdev", "");
! class_addmethod2(c,glob_midi_getcurrentindevs, "getmidicurrentindev", "");
/* tb } */
#ifdef UNIX
! class_addmethod2(c,glob_watchdog, "watchdog", "");
#endif
! class_addmethod2(c,glob_update_class_list, "update-class-list", "ss");
! class_addmethod2(c,glob_update_class_info, "update-class-info", "sss");
! class_addmethod2(c,glob_update_path, "update-path", "");
! class_addmethod2(c,glob_help, "help", "s");
! class_addmethod2(c,glob_redraw, "redraw", "");
! class_addmethod2(c,glob_object_table,"object_table","");
class_addanything(c, max_default);
pd_bind((t_pd *)&glob_pdobject, gensym("pd"));
