From 2407b8a61f848ad42957f73666e891b6af5f0e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 31 Oct 2007 11:37:45 +0000 Subject: query the objects real name instead of assuming that you already know it svn path=/trunk/externals/iem/iemgui/; revision=8917 --- src/cube_sphere.c | 3 ++- src/hfadl_scale.c | 3 ++- src/hfadr_scale.c | 3 ++- src/iem_event.c | 6 ++++-- src/iem_image.c | 12 ++++++++---- src/iem_vu.c | 6 ++++-- src/numberbox_matrix.c | 6 ++++-- src/room_sim_2d.c | 4 +++- src/room_sim_3d.c | 4 +++- src/sym_dial.c | 6 ++++-- src/vfad_scale.c | 7 ++++--- 11 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/cube_sphere.c b/src/cube_sphere.c index ed38b7a..9c65984 100644 --- a/src/cube_sphere.c +++ b/src/cube_sphere.c @@ -261,7 +261,8 @@ static void cube_sphere_save(t_gobj *z, t_binbuf *b) int i, j, c, n=x->x_n_src; binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"), - (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("cube_sphere")); + (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf))); if(x->x_null) binbuf_addv(b, "iii", 0, x->x_radius, x->x_fontsize); else diff --git a/src/hfadl_scale.c b/src/hfadl_scale.c index 7b5d879..1e928c6 100644 --- a/src/hfadl_scale.c +++ b/src/hfadl_scale.c @@ -137,7 +137,8 @@ static void hfadl_scale_save(t_gobj *z, t_binbuf *b) binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("hfadl_scale"), -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)| + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)| ((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2))); binbuf_addv(b, ";"); } diff --git a/src/hfadr_scale.c b/src/hfadr_scale.c index d49ed3a..c7b8334 100644 --- a/src/hfadr_scale.c +++ b/src/hfadr_scale.c @@ -136,7 +136,8 @@ static void hfadr_scale_save(t_gobj *z, t_binbuf *b) binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("hfadr_scale"), -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)| + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)| ((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2))); binbuf_addv(b, ";"); } diff --git a/src/iem_event.c b/src/iem_event.c index 0c7ed8e..5bb73a1 100644 --- a/src/iem_event.c +++ b/src/iem_event.c @@ -128,7 +128,8 @@ static void iem_event_save(t_gobj *z, t_binbuf *b) binbuf_addv(b, "ssiisiiiiss", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("ivnt"), x->x_gui.x_w, x->x_gui.x_h, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gui.x_w, x->x_gui.x_h, iem_symargstoint(&x->x_gui.x_isa), iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]); binbuf_addv(b, ";"); @@ -149,7 +150,8 @@ static void iem_event_save(t_gobj *z, t_binbuf *b) ip2 = (int *)(&x->x_gui.x_fsf); binbuf_addv(b, "ssiisiiiiss", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("ivnt"), x->x_gui.x_w, x->x_gui.x_h, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gui.x_w, x->x_gui.x_h, (*ip1)&IEM_INIT_ARGS_ALL, (*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]); binbuf_addv(b, ";"); diff --git a/src/iem_image.c b/src/iem_image.c index d6eafbe..19b05d0 100644 --- a/src/iem_image.c +++ b/src/iem_image.c @@ -193,12 +193,14 @@ static void iem_image_save(t_gobj *z, t_binbuf *b) if(x->x_gifsym) binbuf_addv(b, "ssiissiiss", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("iem_image"), x->x_gifsym, iem_symargstoint(&x->x_gui.x_isa), + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gifsym, iem_symargstoint(&x->x_gui.x_isa), iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]); else binbuf_addv(b, "ssiisiiiss", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("iem_image"), 0, iem_symargstoint(&x->x_gui.x_isa), + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + 0, iem_symargstoint(&x->x_gui.x_isa), iem_fstyletoint(&x->x_gui.x_fsf), srl[0], srl[1]); binbuf_addv(b, ";"); } @@ -219,12 +221,14 @@ static void iem_image_save(t_gobj *z, t_binbuf *b) if(x->x_gifsym) binbuf_addv(b, "ssiissiiss", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("iem_image"), x->x_gifsym, (*ip1)&IEM_INIT_ARGS_ALL, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gifsym, (*ip1)&IEM_INIT_ARGS_ALL, (*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]); else binbuf_addv(b, "ssiisiiiss", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("iem_image"), 0, (*ip1)&IEM_INIT_ARGS_ALL, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + 0, (*ip1)&IEM_INIT_ARGS_ALL, (*ip2)&IEM_FSTYLE_FLAGS_ALL, srl[0], srl[1]); binbuf_addv(b, ";"); } diff --git a/src/iem_vu.c b/src/iem_vu.c index 3557ba0..9e9c9af 100644 --- a/src/iem_vu.c +++ b/src/iem_vu.c @@ -423,7 +423,8 @@ static void iem_vu_save(t_gobj *z, t_binbuf *b) iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiissiiiiiiii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("iem_vu"), /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120, srl[1], srl[2], x->x_gui.x_ldx, x->x_gui.x_ldy, iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, @@ -442,7 +443,8 @@ static void iem_vu_save(t_gobj *z, t_binbuf *b) ip2 = (int *)(&x->x_gui.x_fsf); binbuf_addv(b, "ssiisiissiiiiiiii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("iem_vu"), /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + /*x->x_gui.x_w+1*/ x->x_gui.x_w, 120, srl[1], srl[2], x->x_gui.x_ldx, x->x_gui.x_ldy, (*ip2)&IEM_FSTYLE_FLAGS_ALL, x->x_gui.x_fontsize, diff --git a/src/numberbox_matrix.c b/src/numberbox_matrix.c index e7f7043..db67446 100644 --- a/src/numberbox_matrix.c +++ b/src/numberbox_matrix.c @@ -527,7 +527,8 @@ static void numberbox_matrix_save(t_gobj *z, t_binbuf *b) binbuf_addv(b, "ssiisiiiiffisssii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("nbxm"), x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h, x->x_min, x->x_max, iem_symargstoint(&x->x_gui.x_isa), srl[0], srl[1], x->x_front_color, iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize); @@ -549,7 +550,8 @@ static void numberbox_matrix_save(t_gobj *z, t_binbuf *b) ip2 = (int *)(&x->x_gui.x_fsf); binbuf_addv(b, "ssiisiiiiffisssii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("nbxm"), x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_n_row, x->x_n_column, x->x_gui.x_w, x->x_gui.x_h, x->x_min, x->x_max, (*ip1)&IEM_INIT_ARGS_ALL, srl[0], srl[1], x->x_front_color, (*ip2)&IEM_FSTYLE_FLAGS_ALL, x->x_gui.x_fontsize); diff --git a/src/room_sim_2d.c b/src/room_sim_2d.c index 26599a3..0bd28a6 100644 --- a/src/room_sim_2d.c +++ b/src/room_sim_2d.c @@ -217,7 +217,9 @@ static void room_sim_2d_save(t_gobj *z, t_binbuf *b) int i, j, c, n=x->x_nr_src; binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"), - (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("room_sim_2d")); + (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)) + ); binbuf_addv(b, "ifffi", x->x_nr_src, x->x_cnvrt_roomlx2pixh, x->x_rho_head, x->x_r_ambi, x->x_fontsize); c = x->x_gui.x_bcol; j = (((0xfc0000 & c) >> 6)|((0xfc00 & c) >> 4)|((0xfc & c) >> 2)); diff --git a/src/room_sim_3d.c b/src/room_sim_3d.c index 67cf21b..24f8fca 100644 --- a/src/room_sim_3d.c +++ b/src/room_sim_3d.c @@ -251,7 +251,9 @@ static void room_sim_3d_save(t_gobj *z, t_binbuf *b) int i, j, c, n=x->x_nr_src; binbuf_addv(b, "ssiis", gensym("#X"),gensym("obj"), - (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, gensym("room_sim_3d")); + (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)) + ); binbuf_addv(b, "ifffi", x->x_nr_src, x->x_cnvrt_roomlx2pixh, x->x_rho_head, x->x_r_ambi, x->x_fontsize); c = x->x_gui.x_bcol; j = (((0xfc0000 & c) >> 6)|((0xfc00 & c) >> 4)|((0xfc & c) >> 2)); diff --git a/src/sym_dial.c b/src/sym_dial.c index 7cf931b..a6c882c 100644 --- a/src/sym_dial.c +++ b/src/sym_dial.c @@ -312,7 +312,8 @@ static void sym_dial_save(t_gobj *z, t_binbuf *b) iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiiiii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("sdl"), x->x_gui.x_w, x->x_gui.x_h, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gui.x_w, x->x_gui.x_h, iem_symargstoint(&x->x_gui.x_isa), x->x_snd_flt0_sym1, srl[0], srl[1], srl[2], x->x_gui.x_ldx, x->x_gui.x_ldy, @@ -338,7 +339,8 @@ static void sym_dial_save(t_gobj *z, t_binbuf *b) ip2 = (int *)(&x->x_gui.x_fsf); binbuf_addv(b, "ssiisiiiisssiiiiiiiii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("sdl"), x->x_gui.x_w, x->x_gui.x_h, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gui.x_w, x->x_gui.x_h, (*ip1)&IEM_INIT_ARGS_ALL, x->x_snd_flt0_sym1, srl[0], srl[1], srl[2], x->x_gui.x_ldx, x->x_gui.x_ldy, diff --git a/src/vfad_scale.c b/src/vfad_scale.c index e31723e..59bc5f1 100644 --- a/src/vfad_scale.c +++ b/src/vfad_scale.c @@ -11,9 +11,9 @@ iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 * #include #ifdef MSW -#include +# include #else -#include +# include #endif /* ------------------------ setup routine ------------------------- */ @@ -136,7 +136,8 @@ static void vfad_scale_save(t_gobj *z, t_binbuf *b) binbuf_addv(b, "ssiisi", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("vfad_scale"), -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)| + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + -1 - (((0xfc0000 & x->x_gui.x_lcol) >> 6)| ((0xfc00 & x->x_gui.x_lcol) >> 4)|((0xfc & x->x_gui.x_lcol) >> 2))); binbuf_addv(b, ";"); } -- cgit v1.2.1