Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25093
Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_vumeter.c Log Message: removing IEM_GUI_DRAW_MODE*
Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.31 retrieving revision 1.1.1.4.2.2.2.32 diff -C2 -d -r1.1.1.4.2.2.2.31 -r1.1.1.4.2.2.2.32 *** g_all_guis.h 12 May 2004 10:25:02 -0000 1.1.1.4.2.2.2.31 --- g_all_guis.h 12 May 2004 10:35:43 -0000 1.1.1.4.2.2.2.32 *************** *** 8,13 **** */
- #define IEM_GUI_DRAW_MODE_SELECT 3 /*die*/ - #define IEM_GUI_DRAW_MODE_ERASE 4 /*die*/ #define IS_A_FLOAT(atom,index) ((atom+index)->a_type == A_FLOAT) #define IS_A_SYMBOL(atom,index) ((atom+index)->a_type == A_SYMBOL) --- 8,11 ----
Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.21 retrieving revision 1.1.1.3.2.2.2.22 diff -C2 -d -r1.1.1.3.2.2.2.21 -r1.1.1.3.2.2.2.22 *** g_vumeter.c 12 May 2004 09:13:18 -0000 1.1.1.3.2.2.2.21 --- g_vumeter.c 12 May 2004 10:35:43 -0000 1.1.1.3.2.2.2.22 *************** *** 39,47 **** void vu_draw(t_vu *x, t_glist *glist, int mode) { iemgui_draw((t_iemgui *)x,glist,mode); ! if(mode == IEM_GUI_DRAW_MODE_SELECT) { ! } else if(mode == IEM_GUI_DRAW_MODE_ERASE) { ! } else { ! sys_mgui((t_iemgui *)x,"set","ii",x->x_rms,x->x_peak); ! } }
--- 39,43 ---- void vu_draw(t_vu *x, t_glist *glist, int mode) { iemgui_draw((t_iemgui *)x,glist,mode); ! sys_mgui((t_iemgui *)x,"set","ii",x->x_rms,x->x_peak); }
Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.36 retrieving revision 1.1.1.4.2.4.2.37 diff -C2 -d -r1.1.1.4.2.4.2.36 -r1.1.1.4.2.4.2.37 *** g_all_guis.c 12 May 2004 10:25:02 -0000 1.1.1.4.2.4.2.36 --- g_all_guis.c 12 May 2004 10:35:42 -0000 1.1.1.4.2.4.2.37 *************** *** 171,176 **** {canvas_deletelinesfor(glist, (t_text *)z); /*why?*/}
! void iemgui_vis(t_gobj *z, t_glist *glist, int vis) ! {((t_iemgui *)z)->x_draw(z, glist, vis ? 0 : IEM_GUI_DRAW_MODE_ERASE);}
/*int iemgui_dialog(t_iemgui *x, t_symbol **srl, int argc, t_atom *argv) { --- 171,179 ---- {canvas_deletelinesfor(glist, (t_text *)z); /*why?*/}
! void iemgui_vis(t_gobj *z, t_glist *glist, int vis) { ! t_iemgui *x = (t_iemgui *)z; ! if (vis) x->x_draw(z, glist, 0); ! else sys_mgui(x,"erase",""); ! }
/*int iemgui_dialog(t_iemgui *x, t_symbol **srl, int argc, t_atom *argv) { *************** *** 264,268 **** EXTERN t_widgetbehavior text_widgetbehavior;
! void pd_upload(t_gobj *self, t_canvas *can) { t_binbuf *buf = binbuf_new(); t_class *c = self->g_pd; --- 267,271 ---- EXTERN t_widgetbehavior text_widgetbehavior;
! EXTERN void pd_upload(t_gobj *self, t_canvas *can) { t_binbuf *buf = binbuf_new(); t_class *c = self->g_pd; *************** *** 322,326 **** }
! void iemgui_subclass (t_class *c) { s_empty = gensym("empty"); class_addmethod(c, (t_method)iemgui_delta, gensym("delta"), A_GIMME, 0); --- 325,329 ---- }
! EXTERN void iemgui_subclass (t_class *c) { s_empty = gensym("empty"); class_addmethod(c, (t_method)iemgui_delta, gensym("delta"), A_GIMME, 0); *************** *** 356,367 **** EXTERN void iemgui_draw(t_iemgui *x, t_glist *glist, int mode) { /*if (!glist_isvisible(glist_getcanvas(glist))) return; <-- doesn't work because NEW object isn't visible yet */ - if (mode==IEM_GUI_DRAW_MODE_ERASE) - sys_mgui(x,"erase",""); - else { pd_upload((t_gobj *)x,glist); ! sys_mgui(x,"draw","");} }
! void iemgui_propertiesfn(t_gobj *x, t_glist *owner) { t_symbol *stub = gfxstub_new((t_pd *)x,x,0); --- 359,367 ---- EXTERN void iemgui_draw(t_iemgui *x, t_glist *glist, int mode) { /*if (!glist_isvisible(glist_getcanvas(glist))) return; <-- doesn't work because NEW object isn't visible yet */ pd_upload((t_gobj *)x,glist); ! sys_mgui(x,"draw",""); }
! EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner) { t_symbol *stub = gfxstub_new((t_pd *)x,x,0); *************** *** 370,374 **** }
! void iemgui_constrain(t_iemgui *x) { x->x_fontsize = MAX(x->x_fontsize,4); x->x_h = iemgui_clip_size(x->x_h); --- 370,374 ---- }
! EXTERN void iemgui_constrain(t_iemgui *x) { x->x_fontsize = MAX(x->x_fontsize,4); x->x_h = iemgui_clip_size(x->x_h); *************** *** 378,390 **** EXTERN void iemgui_init(t_iemgui *x, t_floatarg f) {x->x_isa = (x->x_isa&~1) | !!f;}
! void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv) { t_binbuf *buf = x->x_obj.te_binbuf; ! if (buf) { ! t_atom foo; ! binbuf_clear(buf); ! SETSYMBOL(&foo,qlass); ! binbuf_add(buf,1,&foo); ! binbuf_add(buf,argc,argv); ! } }
--- 378,389 ---- EXTERN void iemgui_init(t_iemgui *x, t_floatarg f) {x->x_isa = (x->x_isa&~1) | !!f;}
! EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv) { ! t_atom foo; t_binbuf *buf = x->x_obj.te_binbuf; ! if (!buf) return; ! binbuf_clear(buf); ! SETSYMBOL(&foo,qlass); ! binbuf_add(buf,1,&foo); ! binbuf_add(buf,argc,argv); }