[PD-cvs] pd/src desire.c,1.1.2.55,1.1.2.56

Mathieu Bouchard matju at users.sourceforge.net
Wed Nov 23 09:59:17 CET 2005


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29615

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
switching to class_addmethod3


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.55
retrieving revision 1.1.2.56
diff -C2 -d -r1.1.2.55 -r1.1.2.56
*** desire.c	21 Nov 2005 22:10:01 -0000	1.1.2.55
--- desire.c	23 Nov 2005 08:59:15 -0000	1.1.2.56
***************
*** 42,45 ****
--- 42,47 ----
  
  #define glist_each(CHILD,GLIST) for(CHILD=(GLIST)->gl_list; CHILD; CHILD=CHILD->g_next)
+ #define class_addmethod3(_cl,_ptr,_str,_sig) class_addmethod2(_cl,(t_method)_ptr,gensym(_str),_sig)
+ 
  
  //--------------------------------------------------------------------------
***************
*** 5199,5243 ****
  void g_array_setup(void)
  {
!     garray_class = class_new(gensym("array"), 0, (t_method)garray_free,
          sizeof(t_garray), CLASS_GOBJ, 0);
!     class_setwidget(garray_class, &garray_widgetbehavior);
!     class_addmethod(garray_class, (t_method)garray_const, gensym("const"),
!         A_DEFFLOAT, A_NULL);
      class_addlist(garray_class, garray_list);
!     class_addmethod(garray_class, (t_method)garray_bounds, gensym("bounds"),
!         A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(garray_class, (t_method)garray_xticks, gensym("xticks"),
!         A_FLOAT, A_FLOAT, A_FLOAT, 0);
!     class_addmethod(garray_class, (t_method)garray_xlabel, gensym("xlabel"),
!         A_GIMME, 0);
!     class_addmethod(garray_class, (t_method)garray_yticks, gensym("yticks"),
!         A_FLOAT, A_FLOAT, A_FLOAT, 0);
!     class_addmethod(garray_class, (t_method)garray_ylabel, gensym("ylabel"),
!         A_GIMME, 0);
!     class_addmethod(garray_class, (t_method)garray_rename, gensym("rename"),
!         A_SYMBOL, 0);
!     class_addmethod(garray_class, (t_method)garray_read, gensym("read"),
!         A_SYMBOL, A_NULL);
!     class_addmethod(garray_class, (t_method)garray_write, gensym("write"),
!         A_SYMBOL, A_NULL);
!     class_addmethod(garray_class, (t_method)garray_resize, gensym("resize"),
!         A_FLOAT, A_NULL);
!     class_addmethod(garray_class, (t_method)garray_print, gensym("print"),
!         A_NULL);
!     class_addmethod(garray_class, (t_method)garray_sinesum, gensym("sinesum"),
!         A_GIMME, 0);
!     class_addmethod(garray_class, (t_method)garray_cosinesum,
!         gensym("cosinesum"), A_GIMME, 0);
!     class_addmethod(garray_class, (t_method)garray_normalize,
!         gensym("normalize"), A_DEFFLOAT, 0);
!     class_addmethod(garray_class, (t_method)garray_arraydialog,
!         gensym("arraydialog"), A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
  /* jsarlo { */
!     class_addmethod(garray_class, (t_method)garray_arrayviewlist_new,
!         gensym("arrayviewlistnew"), A_NULL);
!     class_addmethod(garray_class, (t_method)garray_arrayviewlist_fillpage,
!         gensym("arrayviewlistfillpage"), A_FLOAT, A_NULL);
!     class_addmethod(garray_class, (t_method)garray_arrayviewlist_close,
!       gensym("arrayviewclose"), A_NULL);
  /* } jsarlo */
      class_setsavefn(garray_class, garray_save);
--- 5201,5227 ----
  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);
!     class_setwidget(c, &garray_widgetbehavior);
!     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");
  /* jsarlo { */
!     class_addmethod3(c, garray_arrayviewlist_new, "arrayviewlistnew", "");
!     class_addmethod3(c, garray_arrayviewlist_fillpage, "arrayviewlistfillpage", "f");
!     class_addmethod3(c, garray_arrayviewlist_close, "arrayviewclose", "");
  /* } jsarlo */
      class_setsavefn(garray_class, garray_save);
***************
*** 6251,6256 ****
          (t_method)guiconnect_free, sizeof(t_guiconnect), CLASS_PD, 0);
      class_addanything(guiconnect_class, guiconnect_anything);
!     class_addmethod(guiconnect_class, (t_method)guiconnect_signoff,
!         gensym("signoff"), 0);
  }
  
--- 6235,6239 ----
          (t_method)guiconnect_free, sizeof(t_guiconnect), CLASS_PD, 0);
      class_addanything(guiconnect_class, guiconnect_anything);
!     class_addmethod3(guiconnect_class, guiconnect_signoff, "signoff", "");
  }
  
***************
*** 7248,7262 ****
  static void vinlet_setup(void)
  {
!     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(vinlet_class, vinlet_bang);
!     class_addpointer(vinlet_class, vinlet_pointer);
!     class_addfloat(vinlet_class, vinlet_float);
!     class_addsymbol(vinlet_class, vinlet_symbol);
!     class_addlist(vinlet_class, vinlet_list);
!     class_addanything(vinlet_class, vinlet_anything);
!     class_addmethod(vinlet_class, (t_method)vinlet_dsp, gensym("dsp"), 0);
!     class_sethelpsymbol(vinlet_class, gensym("pd"));
  }
  
--- 7231,7245 ----
  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);
!     class_addfloat(   c, vinlet_float);
!     class_addsymbol(  c, vinlet_symbol);
!     class_addlist(    c, vinlet_list);
!     class_addanything(c, vinlet_anything);
!     class_addmethod3( c, vinlet_dsp, "dsp", "");
!     class_sethelpsymbol(c, gensym("pd"));
  }
  
***************
*** 7545,7559 ****
  static void voutlet_setup(void)
  {
!     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(voutlet_class, voutlet_bang);
!     class_addpointer(voutlet_class, voutlet_pointer);
!     class_addfloat(voutlet_class, (t_method)voutlet_float);
!     class_addsymbol(voutlet_class, voutlet_symbol);
!     class_addlist(voutlet_class, voutlet_list);
!     class_addanything(voutlet_class, voutlet_anything);
!     class_addmethod(voutlet_class, (t_method)voutlet_dsp, gensym("dsp"), 0);
!     class_sethelpsymbol(voutlet_class, gensym("pd"));
  }
  
--- 7528,7542 ----
  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);
!     class_addfloat(   c, (t_method)voutlet_float);
!     class_addsymbol(  c, voutlet_symbol);
!     class_addlist(    c, voutlet_list);
!     class_addanything(c, voutlet_anything);
!     class_addmethod3( c, voutlet_dsp, "dsp", "");
!     class_sethelpsymbol(c, gensym("pd"));
  }
  
***************
*** 8478,8483 ****
      template_class = class_new(gensym("template"), 0, (t_method)template_free,
          sizeof(t_template), CLASS_PD, 0);
!     class_addmethod(pd_canvasmaker, (t_method)template_usetemplate,
!         gensym("struct"), A_GIMME, 0);
          
  }
--- 8461,8465 ----
      template_class = class_new(gensym("template"), 0, (t_method)template_free,
          sizeof(t_template), CLASS_PD, 0);
!     class_addmethod3(pd_canvasmaker, template_usetemplate, "struct", "*");
          
  }
***************
*** 10217,10233 ****
  static void ptrobj_setup(void)
  {
!     ptrobj_class = class_new(gensym("pointer"), (t_newmethod)ptrobj_new,
          (t_method)ptrobj_free, sizeof(t_ptrobj), 0, A_GIMME, 0);
!     class_addmethod(ptrobj_class, (t_method)ptrobj_traverse, gensym("traverse"),
!         A_SYMBOL, 0); 
!     class_addmethod(ptrobj_class, (t_method)ptrobj_next, gensym("next"), 0); 
!     class_addmethod(ptrobj_class, (t_method)ptrobj_vnext, gensym("vnext"), 
!         A_DEFFLOAT, 0); 
!     class_addmethod(ptrobj_class, (t_method)ptrobj_sendwindow,
!         gensym("send-window"), A_GIMME, 0); 
!     class_addmethod(ptrobj_class, (t_method)ptrobj_rewind,
!         gensym("rewind"), 0); 
!     class_addpointer(ptrobj_class, ptrobj_pointer); 
!     class_addbang(ptrobj_class, ptrobj_bang); 
  }
  
--- 10199,10211 ----
  static void ptrobj_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); 
  }
  
***************
*** 10542,10546 ****
          return;
      }
!     w = gs->gs_which==GP_ARRAY ? w = gp->gp_un.gp_w : gp->gp_un.gp_scalar->sc_vec;
      array = *(t_array **)(((char *)w) + onset);
      outlet_float(x->x_obj.ob_outlet, (float)(array->a_n));
--- 10520,10524 ----
          return;
      }
!     w = gs->gs_which==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->sc_vec;
      array = *(t_array **)(((char *)w) + onset);
      outlet_float(x->x_obj.ob_outlet, (float)(array->a_n));
***************
*** 11571,11593 ****
      	CLASS_NOINLET | CLASS_PATCHABLE, 0);
  
!     message_class = class_new(gensym("message"), 0,0,
      	sizeof(t_message), CLASS_PATCHABLE, 0);
!     class_addbang(message_class, message_bang);
!     class_addfloat(message_class, message_float);
!     class_addsymbol(message_class, message_symbol);
!     class_addlist(message_class, message_list);
!     class_addanything(message_class, message_list);
!     class_addmethod(message_class, (t_method)message_set, gensym("set"), A_GIMME, 0);
!     class_addmethod(message_class, (t_method)message_add, gensym("add"), A_GIMME, 0);
!     class_addmethod(message_class, (t_method)message_add2, gensym("add2"), A_GIMME, 0);
  
!     gatom_class = class_new(gensym("gatom"), 0, (t_method)gatom_free,
      	sizeof(t_gatom), CLASS_NOINLET | CLASS_PATCHABLE, 0);
!     class_addbang(gatom_class, gatom_bang);
!     class_addfloat(gatom_class, gatom_float);
!     class_addsymbol(gatom_class, gatom_symbol);
!     class_addmethod(gatom_class, (t_method)gatom_set, gensym("set"), A_GIMME, 0);
!     class_addmethod(gatom_class, (t_method)gatom_param, gensym("param"), A_GIMME, 0);
!     class_setpropertiesfn(gatom_class, gatom_properties);
  }
  
--- 11549,11571 ----
      	CLASS_NOINLET | CLASS_PATCHABLE, 0);
  
!     t_class *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);
!     class_addsymbol(c, message_symbol);
!     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","*");
  
!     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_addmethod3(c, gatom_set, "set","*");
!     class_addmethod3(c, gatom_param, "param","*");
!     class_setpropertiesfn(c, gatom_properties);
  }
  
***************
*** 11864,11875 ****
  static void iemgui_subclass (t_class *c) {
      s_empty = gensym("empty");
!     class_addmethod(c, (t_method)iemgui_delta, gensym("delta"), A_GIMME, 0);
!     class_addmethod(c, (t_method)iemgui_pos, gensym("pos"), A_GIMME, 0);
!     class_addmethod(c, (t_method)iemgui_color, gensym("color"), A_GIMME, 0);
!     class_addmethod(c, (t_method)iemgui_send, gensym("send"), A_DEFSYM, 0);
!     class_addmethod(c, (t_method)iemgui_receive, gensym("receive"), A_DEFSYM, 0);
!     class_addmethod(c, (t_method)iemgui_label, gensym("label"), A_DEFSYM, 0);
!     class_addmethod(c, (t_method)iemgui_label_pos, gensym("label_pos"), A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)iemgui_label_font, gensym("label_font"), A_GIMME, 0);
      class_setpropertiesfn(c, iemgui_propertiesfn);
  }
--- 11842,11853 ----
  static void iemgui_subclass (t_class *c) {
      s_empty = gensym("empty");
!     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","*");
      class_setpropertiesfn(c, iemgui_propertiesfn);
  }
***************
*** 12018,12026 ****
      class_addlist    (c, bng_bang2);
      class_addanything(c, bng_bang2);
!     class_addmethod(c, (t_method)bng_reload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)bng_loadbang, gensym("loadbang"), 0);
!     class_addmethod(c, (t_method)bng_size, gensym("size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0);
!     class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
      class_setsavefn(c, (t_savefn)bng_savefn);
      class_sethelpsymbol(c, gensym("bng"));
--- 11996,12004 ----
      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"));
***************
*** 12105,12114 ****
      class_addbang(c, toggle_bang);
      class_addfloat(c, toggle_float);
!     class_addmethod(c, (t_method)toggle_reload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)toggle_loadbang, gensym("loadbang"), 0);
!     class_addmethod(c, (t_method)toggle_set, gensym("set"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)toggle_size, gensym("size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0);
      class_setsavefn(c, (t_savefn)toggle_savefn);
      class_sethelpsymbol(c, gensym("toggle"));
--- 12083,12092 ----
      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"));
***************
*** 12250,12262 ****
      class_addbang(c, radio_bang);
      class_addfloat(c, radio_float);
!     class_addmethod(c, (t_method)radio_reload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)radio_loadbang, gensym("loadbang"), 0);
!     class_addmethod(c, (t_method)radio_set, gensym("set"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)radio_size, gensym("size"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)radio_fout, gensym("fout"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)radio_number, gensym("number"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)radio_single_change, gensym("single_change"), 0);
!     class_addmethod(c, (t_method)radio_double_change, gensym("double_change"), 0);
      sym_hdl    = gensym("hdl");
      sym_vdl    = gensym("vdl");
--- 12228,12240 ----
      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_single_change, "single_change","");
!     class_addmethod3(c,radio_double_change, "double_change","");
      sym_hdl    = gensym("hdl");
      sym_vdl    = gensym("vdl");
***************
*** 12403,12415 ****
      class_addbang(c,slider_bang);
      class_addfloat(c,slider_float);
!     class_addmethod(c, (t_method)slider_reload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)slider_loadbang, gensym("loadbang"), 0);
!     class_addmethod(c, (t_method)slider_set, gensym("set"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)slider_size, gensym("size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)slider_range, gensym("range"), A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)slider_log, gensym("log"), 0);
!     class_addmethod(c, (t_method)slider_lin, gensym("lin"), 0);
!     class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)slider_steady, gensym("steady"), A_FLOAT, 0);
      sym_vsl     = gensym("vsl");
      sym_vslider = gensym("vslider");
--- 12381,12393 ----
      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");
      sym_vsl     = gensym("vsl");
      sym_vslider = gensym("vslider");
***************
*** 12531,12544 ****
      class_addfloat(c,nbfloat);
      class_addlist(c, nblist);
!     //class_addmethod(c, (t_method)nbmotion, gensym("motion"), A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)nbreload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)nbloadbang, gensym("loadbang"), 0);
!     class_addmethod(c, (t_method)nbset,      gensym("set"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)nbsize,     gensym("size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)nbrange,     gensym("range"), A_GIMME, 0);
!     class_addmethod(c, (t_method)nblog, gensym("log"), 0);
!     class_addmethod(c, (t_method)nblin, gensym("lin"), 0);
!     class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)nblog_height, gensym("log_height"), A_FLOAT, 0);
      class_setsavefn(c,(t_savefn)nbsavefn);
      class_sethelpsymbol(c, gensym("numbox2"));
--- 12509,12522 ----
      class_addfloat(c,nbfloat);
      class_addlist(c, nblist);
!     //class_addmethod3(c,nbmotion,"motion","ff");
!     class_addmethod3(c,nbreload,"reload","*");
!     class_addmethod3(c,nbloadbang,"loadbang","");
!     class_addmethod3(c,nbset,"set","f");
!     class_addmethod3(c,nbsize,"size","*");
!     class_addmethod3(c,nbrange,"range","*");
!     class_addmethod3(c,nblog,"log","");
!     class_addmethod3(c,nblin,"lin","");
!     class_addmethod3(c,iemgui_init,"init","f");
!     class_addmethod3(c,nblog_height,"log_height","f");
      class_setsavefn(c,(t_savefn)nbsavefn);
      class_sethelpsymbol(c, gensym("numbox2"));
***************
*** 12639,12646 ****
      class_addbang(c,vu_bang);
      class_addfloat(c,vu_float0);
!     class_addmethod(c, (t_method)vu_float1, gensym("ft1"), A_FLOAT, 0);
!     class_addmethod(c, (t_method)vu_reload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)vu_size, gensym("size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)vu_scale, gensym("scale"), A_DEFFLOAT, 0);
      class_setsavefn(c,(t_savefn)vu_savefn);
      class_sethelpsymbol(c, gensym("vu"));
--- 12617,12624 ----
      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"));
***************
*** 12713,12720 ****
  	(t_method)iemgui_free, sizeof(t_cnv), CLASS_NOINLET, A_GIMME, 0);
      class_addcreator((t_newmethod)cnv_new, gensym("cnv"), A_GIMME, 0);
!     class_addmethod(c, (t_method)cnv_reload, gensym("reload"), A_GIMME, 0);
!     class_addmethod(c, (t_method)cnv_size, gensym("size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)cnv_vis_size, gensym("vis_size"), A_GIMME, 0);
!     class_addmethod(c, (t_method)cnv_get_pos, gensym("get_pos"), 0);
      iemgui_subclass(c);
      class_setsavefn(c,(t_savefn)cnv_savefn);
--- 12691,12698 ----
  	(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);
***************
*** 12774,12778 ****
      class_addbang(c, dropper_bang);
      class_addsymbol(c, dropper_symbol);
!     class_addmethod(c, (t_method)dropper_reload, gensym("reload"), A_GIMME, 0);
      class_setsavefn(c, (t_savefn)dropper_savefn);
      class_sethelpsymbol(c, gensym("dropper"));
--- 12752,12756 ----
      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"));
***************
*** 12795,12887 ****
      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_addmethod(pd_canvasmaker, (t_method)canvas_new, gensym("canvas"), A_GIMME, 0);
!     class_addmethod(c, (t_method)canvas_restore, gensym("restore"), A_GIMME, 0);
!     class_addmethod(c, (t_method)canvas_coords,  gensym("coords"), A_GIMME, 0);
!     class_addmethod(c, (t_method)canvas_obj,     gensym("obj"),      A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_msg,     gensym("msg"),      A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_floatatom, gensym("floatatom"), A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_symbolatom, gensym("symbolatom"), A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)glist_text,     gensym("text"),     A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)glist_glist,    gensym("graph"),    A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)glist_scalar,   gensym("scalar"),   A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_bng,     gensym("bng"),      A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_toggle,  gensym("toggle"),   A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_vslider, gensym("vslider"),  A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_hslider, gensym("hslider"),  A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_hdial,   gensym("hdial"),    A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_vdial,   gensym("vdial"),    A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_hradio,  gensym("hradio"),   A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_vradio,  gensym("vradio"),   A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_vumeter, gensym("vumeter"),  A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_mycnv,   gensym("mycnv"),    A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_numbox,  gensym("numbox"),   A_GIMME, A_NULL);
  
!     class_addmethod(c, (t_method)canvas_pop, gensym("pop"), A_DEFFLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_loadbang, gensym("loadbang"), A_NULL);
!     class_addmethod(c, (t_method)canvas_relocate, gensym("relocate"), A_SYMBOL, A_SYMBOL, A_NULL);
!     class_addmethod(c, (t_method)canvas_vis, gensym("vis"), A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)glist_menu_open, gensym("menu-open"), A_NULL);
!     class_addmethod(c, (t_method)canvas_map, gensym("map"), A_FLOAT, A_NULL);
      class_setpropertiesfn(c, (t_propertiesfn)canvas_properties);
  
!     class_addmethod(c, (t_method)glist_clear, gensym("clear"), A_NULL);
!     class_addcreator((t_newmethod)subcanvas_new, gensym("pd"),    A_DEFSYMBOL, 0);
      class_addcreator((t_newmethod)subcanvas_new, gensym("page"),  A_DEFSYMBOL, 0);
! //  class_addmethod(c, (t_method)canvas_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)canvas_dsp, gensym("dsp"), 0);
!     class_addmethod(c, (t_method)canvas_rename_method, gensym("rename"), A_GIMME, 0);
      class_addcreator((t_newmethod)table_new, gensym("table"), A_DEFSYM, A_DEFFLOAT, 0);
  
!     class_addmethod(c, (t_method)canvas_mousedown, gensym("mouse"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_mouseup, gensym("mouseup"), A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_key, gensym("key"), A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_motion, gensym("motion"),   A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_menuclose, gensym("menuclose"), A_DEFFLOAT, 0);
!     class_addmethod(c, (t_method)canvas_cut,       gensym("cut"), A_NULL);
!     class_addmethod(c, (t_method)canvas_copy,      gensym("copy"), A_NULL);
!     class_addmethod(c, (t_method)canvas_paste,     gensym("paste"), A_NULL);
!     class_addmethod(c, (t_method)canvas_duplicate, gensym("duplicate"), A_NULL);
!     class_addmethod(c, (t_method)canvas_selectall, gensym("selectall"), A_NULL);
!     class_addmethod(c, (t_method)canvas_undo,      gensym("undo"), A_NULL);
!     class_addmethod(c, (t_method)canvas_redo,      gensym("redo"), A_NULL);
!     class_addmethod(c, (t_method)canvas_tidy,      gensym("tidy"), A_NULL);
!     class_addmethod(c, (t_method)canvas_texteditor,gensym("texteditor"), A_NULL);
!     class_addmethod(c, (t_method)canvas_editmode,  gensym("editmode"), A_DEFFLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_print,     gensym("print"), A_SYMBOL, A_NULL);
!     class_addmethod(c, (t_method)canvas_menufont,  gensym("menufont"), A_NULL);
!     class_addmethod(c, (t_method)canvas_font,      gensym("font"), A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_find,      gensym("find"), A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)canvas_find_again,  gensym("findagain"), A_NULL);
!     class_addmethod(c, (t_method)canvas_find_parent, gensym("findparent"), A_NULL);
!     class_addmethod(c, (t_method)canvas_done_popup,  gensym("done-popup"), A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_donecanvasdialog, gensym("donecanvasdialog"), A_GIMME, A_NULL);
!     class_addmethod(c, (t_method)glist_arraydialog, gensym("arraydialog"), A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_connect, gensym("connect"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_disconnect, gensym("disconnect"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
      copy_binbuf = binbuf_new();
  
!     class_addmethod(c, (t_method)glist_write, gensym("write"), A_SYMBOL, A_DEFSYM, A_NULL);
!     class_addmethod(c, (t_method)glist_read,  gensym("read"), A_SYMBOL, A_DEFSYM, A_NULL);
!     class_addmethod(c, (t_method)glist_mergefile,   gensym("mergefile"), A_SYMBOL, A_DEFSYM, A_NULL);
!     class_addmethod(c, (t_method)canvas_savetofile, gensym("savetofile"), A_SYMBOL, A_SYMBOL, 0);
!     class_addmethod(c, (t_method)canvas_saveto,     gensym("saveto"), A_CANT, 0);
!     class_addmethod(c, (t_method)canvas_menusave,   gensym("menusave"), 0);
!     class_addmethod(c, (t_method)canvas_menusaveas, gensym("menusaveas"), 0);
  
      class_setwidget(c, &graph_widgetbehavior);
!     class_addmethod(c, (t_method)graph_bounds, gensym("bounds"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)graph_xticks, gensym("xticks"), A_FLOAT, A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)graph_xlabel, gensym("xlabel"), A_GIMME, 0);
!     class_addmethod(c, (t_method)graph_yticks, gensym("yticks"), A_FLOAT, A_FLOAT, A_FLOAT, 0);
!     class_addmethod(c, (t_method)graph_ylabel, gensym("ylabel"), A_GIMME, 0);
!     class_addmethod(c, (t_method)graph_array, gensym("array"),   A_SYMBOL, A_FLOAT, A_SYMBOL, A_DEFFLOAT, A_NULL);
!     class_addmethod(c, (t_method)canvas_menuarray, gensym("menuarray"), A_NULL);
!     class_addmethod(c, (t_method)glist_arraydialog, gensym("arraydialog"), A_SYMBOL, A_FLOAT, A_FLOAT, A_FLOAT, A_NULL);
!     class_addmethod(c, (t_method)glist_sort, gensym("sort"), A_NULL);
! 
!     class_addmethod(c, (t_method)canvas_text_setto, gensym("text_setto"), A_GIMME, 0);
      class_setnotice(c, canvas_notice);
  }
--- 12773,12864 ----
      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,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,glist_text,"text","*");
!     class_addmethod3(c,glist_glist,"graph","*");
!     class_addmethod3(c,glist_scalar,"scalar","*");
!     class_addmethod3(c,canvas_bng,"bng","*");
!     class_addmethod3(c,canvas_toggle,"toggle","*");
!     class_addmethod3(c,canvas_vslider,"vslider","*");
!     class_addmethod3(c,canvas_hslider,"hslider","*");
!     class_addmethod3(c,canvas_hdial,"hdial","*");
!     class_addmethod3(c,canvas_vdial,"vdial","*");
!     class_addmethod3(c,canvas_hradio,"hradio","*");
!     class_addmethod3(c,canvas_vradio,"vradio","*");
!     class_addmethod3(c,canvas_vumeter,"vumeter","*");
!     class_addmethod3(c,canvas_mycnv,"mycnv","*");
!     class_addmethod3(c,canvas_numbox,"numbox","*");
  
!     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,glist_menu_open,"menu-open","");
!     class_addmethod3(c,canvas_map,"map","f");
      class_setpropertiesfn(c, (t_propertiesfn)canvas_properties);
  
!     class_addmethod3(c,glist_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_click,"click","fffff");
!     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_mousedown,"mouse","ffff");
!     class_addmethod3(c,canvas_mouseup,"mouseup","fff");
!     class_addmethod3(c,canvas_key,"key","*");
!     class_addmethod3(c,canvas_motion,"motion","fff");
!     class_addmethod3(c,canvas_menuclose,"menuclose","F");
!     class_addmethod3(c,canvas_cut,      "cut","");
!     class_addmethod3(c,canvas_copy,     "copy","");
!     class_addmethod3(c,canvas_paste,    "paste","");
!     class_addmethod3(c,canvas_duplicate,"duplicate","");
!     class_addmethod3(c,canvas_selectall,"selectall","");
!     class_addmethod3(c,canvas_undo,     "undo","");
!     class_addmethod3(c,canvas_redo,     "redo","");
!     class_addmethod3(c,canvas_tidy,     "tidy","");
!     class_addmethod3(c,canvas_texteditor,"texteditor","");
!     class_addmethod3(c,canvas_editmode, "editmode","F");
!     class_addmethod3(c,canvas_print,    "print","s");
!     class_addmethod3(c,canvas_menufont, "menufont","");
!     class_addmethod3(c,canvas_font,     "font","fff");
!     class_addmethod3(c,canvas_find,     "find","*");
!     class_addmethod3(c,canvas_find_again, "findagain","");
!     class_addmethod3(c,canvas_find_parent,"findparent","");
!     class_addmethod3(c,canvas_done_popup, "done-popup","fff");
!     class_addmethod3(c,canvas_donecanvasdialog,"donecanvasdialog","*");
!     class_addmethod3(c,glist_arraydialog,"arraydialog","sfff");
!     class_addmethod3(c,canvas_connect,"connect","ffff");
!     class_addmethod3(c,canvas_disconnect,"disconnect","ffff");
      copy_binbuf = binbuf_new();
  
!     class_addmethod3(c,glist_write,"write","sS");
!     class_addmethod3(c,glist_read, "read","sS");
!     class_addmethod3(c,glist_mergefile,  "mergefile","sS");
!     class_addmethod3(c,canvas_savetofile,"savetofile","ss");
!     class_addmethod3(c,canvas_saveto,    "saveto","!");
!     class_addmethod3(c,canvas_menusave,  "menusave","");
!     class_addmethod3(c,canvas_menusaveas,"menusaveas","");
  
      class_setwidget(c, &graph_widgetbehavior);
!     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_menuarray,"menuarray","");
!     class_addmethod3(c,glist_arraydialog,"arraydialog","sfff");
!     class_addmethod3(c,glist_sort,"sort","");
!     class_addmethod3(c,canvas_text_setto,"text_setto","*");
      class_setnotice(c, canvas_notice);
  }





More information about the Pd-cvs mailing list