[PD-cvs] pd/src desire.c,1.1.2.217.2.59,1.1.2.217.2.60
Mathieu Bouchard
matju at users.sourceforge.net
Wed Dec 13 04:03:32 CET 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30992
Modified Files:
Tag: desiredata
desire.c
Log Message:
merged all iemgui setup functions
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.59
retrieving revision 1.1.2.217.2.60
diff -C2 -d -r1.1.2.217.2.59 -r1.1.2.217.2.60
*** desire.c 13 Dec 2006 02:53:00 -0000 1.1.2.217.2.59
--- desire.c 13 Dec 2006 03:03:27 -0000 1.1.2.217.2.60
***************
*** 6741,6764 ****
}
- static void g_bang_setup(void) {
- t_class *c = bng_class = class_new(gensym("bng"), (t_newmethod)bng_new,
- (t_method)iemgui_free, sizeof(t_bng), 0, A_GIMME, 0);
- iemgui_subclass(c);
- class_addbang (c, bng_bang);
- class_addfloat (c, bng_bang2);
- class_addsymbol (c, bng_bang2);
- class_addpointer (c, bng_bang2);
- 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"));
- class_setfieldnames(c, "foo bar x1 y1 class w hold break isa snd rcv lab ldx ldy fstyle fs bcol fcol lcol");
- }
-
static t_class *toggle_class;
--- 6741,6744 ----
***************
*** 6811,6831 ****
}
- static void g_toggle_setup(void) {
- t_class *c = toggle_class = class_new(gensym("tgl"), (t_newmethod)toggle_new,
- (t_method)iemgui_free, sizeof(t_toggle), 0, A_GIMME, 0);
- class_addcreator((t_newmethod)toggle_new, gensym("toggle"), A_GIMME, 0);
- iemgui_subclass(c);
- 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"));
- }
-
static int isvert(void /* t_slider or t_radio */ *x_) {
t_slider *x = (t_slider *)x_;
--- 6791,6794 ----
***************
*** 6940,6972 ****
}
- static void g_radio_setup(void) {
- t_class *c = radio_class = class_new(gensym("radio"), (t_newmethod)radio_new,
- (t_method)iemgui_free, sizeof(t_radio), 0, A_GIMME, 0);
- iemgui_subclass(c);
- 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");
- sym_vradio = gensym("vradio");
- class_setsavefn(c,(t_savefn)radio_savefn);
- class_sethelpsymbol(c, gensym("hradio"));
- class_addcreator((t_newmethod)radio_new, gensym("hradio"), A_GIMME, 0);
- class_addcreator((t_newmethod)radio_new, gensym("vradio"), A_GIMME, 0);
- class_addcreator((t_newmethod)radio_new, gensym("hdl"), A_GIMME, 0);
- class_addcreator((t_newmethod)radio_new, gensym("vdl"), A_GIMME, 0);
- class_addcreator((t_newmethod)radio_new, gensym("rdb"), A_GIMME, 0);
- class_addcreator((t_newmethod)radio_new, gensym("radiobut"), A_GIMME, 0);
- class_addcreator((t_newmethod)radio_new, gensym("radiobutton"), A_GIMME, 0);
- }
-
#define IEM_SL_DEFAULTSIZE 128
#define IEM_SL_MINSIZE 2
--- 6903,6906 ----
***************
*** 7074,7103 ****
}
- static void g_slider_setup(void) {
- t_class *c = slider_class = class_new(gensym("slider"), (t_newmethod)slider_new,
- (t_method)iemgui_free, sizeof(t_slider), 0, A_GIMME, 0);
- class_addcreator((t_newmethod)slider_new, gensym("hslider"), A_GIMME, 0);
- class_addcreator((t_newmethod)slider_new, gensym("vslider"), A_GIMME, 0);
- class_addcreator((t_newmethod)slider_new, gensym( "hsl"), A_GIMME, 0);
- class_addcreator((t_newmethod)slider_new, gensym( "vsl"), A_GIMME, 0);
-
- iemgui_subclass(c);
- 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");
- class_setsavefn(c,(t_savefn)slider_savefn);
- class_sethelpsymbol(c, gensym("hslider"));
- }
-
static t_class *nbx_class;
--- 7008,7011 ----
***************
*** 7191,7215 ****
}
- static void g_numbox_setup(void) {
- t_class *c = nbx_class = class_new(gensym("nbx"), (t_newmethod)nbx_new,
- (t_method)iemgui_free, sizeof(t_nbx), 0, A_GIMME, 0);
- class_addcreator((t_newmethod)nbx_new, gensym("nbx"), A_GIMME, 0);
- iemgui_subclass(c);
- class_addbang(c,nbx_bang);
- 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"));
- }
-
#define IEM_VU_STEPS 40
--- 7099,7102 ----
***************
*** 7296,7313 ****
}
- static void g_vumeter_setup(void) {
- t_class *c = vu_class = class_new(gensym("vu"),
- (t_newmethod)vu_new, (t_method)iemgui_free, sizeof(t_vu), 0, A_GIMME, 0);
- iemgui_subclass(c);
- 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"));
- }
-
static t_class *cnv_class;
--- 7183,7186 ----
***************
*** 7369,7385 ****
}
- static void g_mycanvas_setup(void) {
- t_class *c = cnv_class = class_new(gensym("cnv"), (t_newmethod)cnv_new,
- (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);
- class_sethelpsymbol(c, gensym("cnv"));
- }
-
static t_class *dropper_class;
--- 7242,7245 ----
***************
*** 7421,7435 ****
}
- static void g_dropper_setup(void) {
- t_class *c = dropper_class = class_new(gensym("dropper"), (t_newmethod)dropper_new,
- (t_method)iemgui_free, sizeof(t_dropper), 0, A_GIMME, 0);
- iemgui_subclass(c);
- 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"));
- }
-
void canvas_notice(t_gobj *x, struct _gobj *origin, int argc, t_atom *argv) {
t_canvas *self = (t_canvas *)x;
--- 7281,7284 ----
***************
*** 7754,7757 ****
--- 7603,7607 ----
extern "C"
void desire_setup(void) {
+ t_class *c;
s_empty = gensym("empty");
s_Pd = gensym("Pd");
***************
*** 7763,7772 ****
manager = manager_new(0,0,0);
#define S(x) x##_setup();
! S(vinlet) S(voutlet)
! S(g_array) S(g_canvas) S(g_scalar) S(g_template)
! S(g_traversal) S(g_text) S(g_bang) S(g_toggle) S(g_radio)
! S(g_slider) S(g_numbox) S(g_mycanvas) S(g_vumeter) S(g_dropper)
#undef S
visualloader_class = class_new(gensym("#V"), (t_newmethod)visualloader_new,
(t_method)visualloader_free, sizeof(t_object), CLASS_GOBJ, A_GIMME, 0);
--- 7613,7753 ----
manager = manager_new(0,0,0);
#define S(x) x##_setup();
! S(vinlet) S(voutlet) S(g_array) S(g_canvas) S(g_scalar) S(g_template) S(g_traversal) S(g_text)
#undef S
+ c = bng_class = class_new(gensym("bng"), (t_newmethod)bng_new,
+ (t_method)iemgui_free, sizeof(t_bng), 0, A_GIMME, 0);
+ iemgui_subclass(c);
+ class_addbang (c, bng_bang);
+ class_addfloat (c, bng_bang2);
+ class_addsymbol (c, bng_bang2);
+ class_addpointer (c, bng_bang2);
+ 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"));
+ class_setfieldnames(c, "foo bar x1 y1 class w hold break isa snd rcv lab ldx ldy fstyle fs bcol fcol lcol");
+
+ c = toggle_class = class_new(gensym("tgl"), (t_newmethod)toggle_new,
+ (t_method)iemgui_free, sizeof(t_toggle), 0, A_GIMME, 0);
+ class_addcreator((t_newmethod)toggle_new, gensym("toggle"), A_GIMME, 0);
+ iemgui_subclass(c);
+ 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"));
+
+ c = radio_class = class_new(gensym("radio"), (t_newmethod)radio_new,
+ (t_method)iemgui_free, sizeof(t_radio), 0, A_GIMME, 0);
+ iemgui_subclass(c);
+ 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");
+ sym_vradio = gensym("vradio");
+ class_setsavefn(c,(t_savefn)radio_savefn);
+ class_sethelpsymbol(c, gensym("hradio"));
+ class_addcreator((t_newmethod)radio_new, gensym("hradio"), A_GIMME, 0);
+ class_addcreator((t_newmethod)radio_new, gensym("vradio"), A_GIMME, 0);
+ class_addcreator((t_newmethod)radio_new, gensym("hdl"), A_GIMME, 0);
+ class_addcreator((t_newmethod)radio_new, gensym("vdl"), A_GIMME, 0);
+ class_addcreator((t_newmethod)radio_new, gensym("rdb"), A_GIMME, 0);
+ class_addcreator((t_newmethod)radio_new, gensym("radiobut"), A_GIMME, 0);
+ class_addcreator((t_newmethod)radio_new, gensym("radiobutton"), A_GIMME, 0);
+
+ c = slider_class = class_new(gensym("slider"), (t_newmethod)slider_new,
+ (t_method)iemgui_free, sizeof(t_slider), 0, A_GIMME, 0);
+ class_addcreator((t_newmethod)slider_new, gensym("hslider"), A_GIMME, 0);
+ class_addcreator((t_newmethod)slider_new, gensym("vslider"), A_GIMME, 0);
+ class_addcreator((t_newmethod)slider_new, gensym( "hsl"), A_GIMME, 0);
+ class_addcreator((t_newmethod)slider_new, gensym( "vsl"), A_GIMME, 0);
+
+ iemgui_subclass(c);
+ 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");
+ class_setsavefn(c,(t_savefn)slider_savefn);
+ class_sethelpsymbol(c, gensym("hslider"));
+
+ c = nbx_class = class_new(gensym("nbx"), (t_newmethod)nbx_new,
+ (t_method)iemgui_free, sizeof(t_nbx), 0, A_GIMME, 0);
+ class_addcreator((t_newmethod)nbx_new, gensym("nbx"), A_GIMME, 0);
+ iemgui_subclass(c);
+ class_addbang(c,nbx_bang);
+ 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"));
+
+ c = cnv_class = class_new(gensym("cnv"), (t_newmethod)cnv_new,
+ (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);
+ class_sethelpsymbol(c, gensym("cnv"));
+
+ c = vu_class = class_new(gensym("vu"), (t_newmethod)vu_new, (t_method)iemgui_free, sizeof(t_vu), 0, A_GIMME, 0);
+ iemgui_subclass(c);
+ 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"));
+
+ c = dropper_class = class_new(gensym("dropper"), (t_newmethod)dropper_new,
+ (t_method)iemgui_free, sizeof(t_dropper), 0, A_GIMME, 0);
+ iemgui_subclass(c);
+ 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"));
+
visualloader_class = class_new(gensym("#V"), (t_newmethod)visualloader_new,
(t_method)visualloader_free, sizeof(t_object), CLASS_GOBJ, A_GIMME, 0);
***************
*** 8095,8099 ****
/* ---------------------------------------------------------------- */
! /* formerly m_conf.c and s_entry.c */
#define S(name) void name##_setup(void); name##_setup();
--- 8076,8080 ----
/* ---------------------------------------------------------------- */
! /* formerly m_conf.c */
#define S(name) void name##_setup(void); name##_setup();
More information about the Pd-cvs
mailing list