Pd-cvs May 2004

pd-cvs@lists.iem.at

9 participants
169 discussions

pd/src g_all_guis.c,1.1.1.4.2.4.2.37,1.1.1.4.2.4.2.38 g_all_guis.h,1.1.1.4.2.2.2.32,1.1.1.4.2.2.2.33 g_bang.c,1.1.1.3.2.2.2.29,1.1.1.3.2.2.2.30 g_dropper.c,1.1.2.21,1.1.2.22 g_hdial.c,1.1.1.4.2.2.2.26,1.1.1.4.2.2.2.27 g_hslider.c,1.1.1.3.2.2.2.31,1.1.1.3.2.2.2.32 g_mycanvas.c,1.1.1.3.2.2.2.17,1.1.1.3.2.2.2.18 g_numbox.c,1.1.1.4.2.2.2.26,1.1.1.4.2.2.2.27 g_toggle.c,1.1.1.3.2.2.2.25,1.1.1.3.2.2.2.26 g_vumeter.c,1.1.1.3.2.2.2.22,1.1.1.3.2.2.2.23
by Mathieu Bouchard 13 May '04

13 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20133 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_bang.c g_dropper.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c g_toggle.c g_vumeter.c Log Message: replacing iemgui_dodraw() by pd_changed(), and added more bugs. Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.25 retrieving revision 1.1.1.3.2.2.2.26 diff -C2 -d -r1.1.1.3.2.2.2.25 -r1.1.1.3.2.2.2.26 *** g_toggle.c 12 May 2004 10:25:02 -0000 1.1.1.3.2.2.2.25 --- g_toggle.c 13 May 2004 14:37:20 -0000 1.1.1.3.2.2.2.26 *************** *** 39,43 **** { x->x_on = x->x_on?0.0:x->x_nonzero; ! iemgui_dodraw((t_iemgui *)x); toggle_action(x); } --- 39,43 ---- { x->x_on = x->x_on?0.0:x->x_nonzero; ! pd_changed(x); toggle_action(x); } *************** *** 48,52 **** x->x_on=f; if(f) x->x_nonzero=f; ! if (on!=x->x_on) iemgui_dodraw((t_iemgui *)x); } --- 48,52 ---- x->x_on=f; if(f) x->x_nonzero=f; ! if (on!=x->x_on) pd_changed(x); } *************** *** 82,86 **** iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 82,86 ---- iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.26 retrieving revision 1.1.1.4.2.2.2.27 diff -C2 -d -r1.1.1.4.2.2.2.26 -r1.1.1.4.2.2.2.27 *** g_hdial.c 12 May 2004 10:25:02 -0000 1.1.1.4.2.2.2.26 --- g_hdial.c 13 May 2004 14:37:20 -0000 1.1.1.4.2.2.2.27 *************** *** 44,48 **** if(x->x_on!=old) x->x_on_old = x->x_on; x->x_on = i; ! iemgui_dodraw((t_iemgui *)x); if(x->x_on!=old) x->x_on_old = old; } --- 44,48 ---- if(x->x_on!=old) x->x_on_old = x->x_on; x->x_on = i; ! pd_changed(x); if(x->x_on!=old) x->x_on_old = old; } *************** *** 84,88 **** x->x_on_old = x->x_on; x->x_on = i; ! iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; radio_send2(x,x->x_on,1.0); --- 84,88 ---- x->x_on_old = x->x_on; x->x_on = i; ! pd_changed(x); x->x_on_old = x->x_on; radio_send2(x,x->x_on,1.0); *************** *** 90,94 **** x->x_on = i; radio_send(x,x->x_on); ! iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; } --- 90,94 ---- x->x_on = i; radio_send(x,x->x_on); ! pd_changed(x); x->x_on_old = x->x_on; } *************** *** 106,110 **** x->x_on_old = x->x_on; x->x_on = i; ! iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; if(iemgui_forward(x)) radio_send2(x,x->x_on,1.0); --- 106,110 ---- x->x_on_old = x->x_on; x->x_on = i; ! pd_changed(x); x->x_on_old = x->x_on; if(iemgui_forward(x)) radio_send2(x,x->x_on,1.0); *************** *** 112,116 **** x->x_on = i; if (iemgui_forward(x)) radio_send(x,x->x_on); ! iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; } --- 112,116 ---- x->x_on = i; if (iemgui_forward(x)) radio_send(x,x->x_on); ! pd_changed(x); x->x_on_old = x->x_on; } *************** *** 125,133 **** CLAMP(n,1,IEM_RADIO_MAX); if(n != x->x_number) { ! x->x_gui.x_draw(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE); x->x_number = n; CLAMP(x->x_on,0,x->x_number-1); x->x_on_old = x->x_on; ! iemgui_dodraw((t_iemgui *)x); } } --- 125,133 ---- CLAMP(n,1,IEM_RADIO_MAX); if(n != x->x_number) { ! sys_mgui(x,"erase",""); x->x_number = n; CLAMP(x->x_on,0,x->x_number-1); x->x_on_old = x->x_on; ! pd_changed(x); } } *************** *** 152,156 **** iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 152,156 ---- iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.22 retrieving revision 1.1.1.3.2.2.2.23 diff -C2 -d -r1.1.1.3.2.2.2.22 -r1.1.1.3.2.2.2.23 *** g_vumeter.c 12 May 2004 10:35:43 -0000 1.1.1.3.2.2.2.22 --- g_vumeter.c 13 May 2004 14:37:20 -0000 1.1.1.3.2.2.2.23 *************** *** 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); } --- 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); } *************** *** 60,64 **** static void vu_scale(t_vu *x, t_floatarg fscale) ! {x->x_scale = !!fscale; iemgui_dodraw((t_iemgui *)x);} static void vu_size(t_vu *x, t_symbol *s, int ac, t_atom *av) --- 60,64 ---- static void vu_scale(t_vu *x, t_floatarg fscale) ! {x->x_scale = !!fscale; pd_changed(x);} static void vu_size(t_vu *x, t_symbol *s, int ac, t_atom *av) *************** *** 66,73 **** x->x_gui.x_w = iemgui_clip_size((int)atom_getintarg(0, ac, av)); if(ac > 1) vu_check_height(x, (int)atom_getintarg(1, ac, av)); ! if(glist_isvisible(x->x_gui.x_glist)) { ! iemgui_dodraw((t_iemgui *)x); canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); - } } --- 66,72 ---- x->x_gui.x_w = iemgui_clip_size((int)atom_getintarg(0, ac, av)); if(ac > 1) vu_check_height(x, (int)atom_getintarg(1, ac, av)); ! pd_changed(x); ! if(glist_isvisible(x->x_gui.x_glist)) canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } *************** *** 100,104 **** iemgui_constrain(y); if(y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 99,103 ---- iemgui_constrain(y); if(y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } 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.37 retrieving revision 1.1.1.4.2.4.2.38 diff -C2 -d -r1.1.1.4.2.4.2.37 -r1.1.1.4.2.4.2.38 *** g_all_guis.c 12 May 2004 10:35:42 -0000 1.1.1.4.2.4.2.37 --- g_all_guis.c 13 May 2004 14:37:20 -0000 1.1.1.4.2.4.2.38 *************** *** 31,36 **** t_symbol *s_empty; - EXTERN void iemgui_dodraw(t_iemgui *x) {x->x_draw(x,x->x_glist, 0);} - /*------------------ global varaibles -------------------------*/ --- 31,34 ---- *************** *** 86,90 **** x->x_snd = canvas_realizedollar(x->x_glist, s); if (x->x_snd==s_empty) x->x_snd=0; ! iemgui_dodraw(x); } --- 84,88 ---- x->x_snd = canvas_realizedollar(x->x_glist, s); if (x->x_snd==s_empty) x->x_snd=0; ! pd_changed(x); } *************** *** 103,112 **** x->x_rcv = rcv; } ! if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); } static void iemgui_label(t_iemgui *x, t_symbol *s) { x->x_lab = s; ! if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); } --- 101,110 ---- x->x_rcv = rcv; } ! pd_changed(x); } static void iemgui_label(t_iemgui *x, t_symbol *s) { x->x_lab = s; ! pd_changed(x); } *************** *** 114,118 **** x->x_ldx = (int)ldx; x->x_ldy = (int)ldy; ! if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); } --- 112,116 ---- x->x_ldx = (int)ldx; x->x_ldy = (int)ldy; ! pd_changed(x); } *************** *** 120,129 **** x->x_fontsize = MAX(4,(int)atom_getintarg(1, ac, av)); x->x_font_style = atom_getintarg(0, ac, av); ! if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); } void iemgui_size(t_iemgui *x) { if(glist_isvisible(x->x_glist)) { ! iemgui_dodraw(x); canvas_fixlinesfor(glist_getcanvas(x->x_glist), (t_text*)x); } --- 118,127 ---- x->x_fontsize = MAX(4,(int)atom_getintarg(1, ac, av)); x->x_font_style = atom_getintarg(0, ac, av); ! pd_changed(x); } void iemgui_size(t_iemgui *x) { if(glist_isvisible(x->x_glist)) { ! pd_changed(x); canvas_fixlinesfor(glist_getcanvas(x->x_glist), (t_text*)x); } *************** *** 153,157 **** if(ac > 2) x->x_fcol = iemgui_compatible_col(atom_getintarg(i++, ac, av)); x->x_lcol = iemgui_compatible_col(atom_getintarg(i++, ac, av)); ! if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); } --- 151,155 ---- if(ac > 2) x->x_fcol = iemgui_compatible_col(atom_getintarg(i++, ac, av)); x->x_lcol = iemgui_compatible_col(atom_getintarg(i++, ac, av)); ! pd_changed(x); } *************** *** 161,170 **** x->x_obj.te_xpix += dx; x->x_obj.te_ypix += dy; ! x->x_draw(z, glist, 0); canvas_fixlinesfor(glist_getcanvas(glist), (t_text *)z); } void iemgui_select(t_gobj *z, t_glist *glist, int selected) ! {t_iemgui *x = (t_iemgui *)z; sys_vgui("canvas_select_object .x%x %x %d; ",glist,z,selected); x->x_draw(z,glist,0);} void iemgui_delete(t_gobj *z, t_glist *glist) --- 159,168 ---- x->x_obj.te_xpix += dx; x->x_obj.te_ypix += dy; ! pd_changed(z); canvas_fixlinesfor(glist_getcanvas(glist), (t_text *)z); } void iemgui_select(t_gobj *z, t_glist *glist, int selected) ! {t_iemgui *x = (t_iemgui *)z; sys_vgui("canvas_select_object .x%x %x %d; ",glist,z,selected); pd_changed(z);} void iemgui_delete(t_gobj *z, t_glist *glist) *************** *** 173,177 **** 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",""); } --- 171,175 ---- void iemgui_vis(t_gobj *z, t_glist *glist, int vis) { t_iemgui *x = (t_iemgui *)z; ! if (vis) pd_changed(z); else sys_mgui(x,"erase",""); } *************** *** 357,364 **** } ! 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",""); } --- 355,367 ---- } ! EXTERN void iemgui_draw(t_iemgui *self, t_glist *glist, int mode) { ! fprintf(stderr,"self=%08x, self->te_binbuf=%08x\n",self,self->x_obj.te_binbuf); ! if (!self->x_obj.te_binbuf) { ! pd_error(self,"trying to upload without binbuf"); ! return; ! } ! pd_upload((t_gobj *)self,glist); ! //if (!glist_isvisible(glist_getcanvas(glist))) return; /* <-- doesn't really work */ ! sys_mgui(self,"draw",""); } *************** *** 397,398 **** --- 400,408 ---- return !self->x_snd || !self->x_rcv || self->x_snd != self->x_rcv; } + + /* LATER this will instead maintain a hashtable of objects that should redrawn, + and the scheduler will flush it (or part of it) once in a while... */ + EXTERN void pd_changed (/*t_gobj*/ void *x) { + t_iemgui *self = (t_iemgui *)x; + self->x_draw(self,self->x_glist, 0); + } Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2.2.17 retrieving revision 1.1.1.3.2.2.2.18 diff -C2 -d -r1.1.1.3.2.2.2.17 -r1.1.1.3.2.2.2.18 *** g_mycanvas.c 12 May 2004 09:13:18 -0000 1.1.1.3.2.2.2.17 --- g_mycanvas.c 13 May 2004 14:37:20 -0000 1.1.1.3.2.2.2.18 *************** *** 30,47 **** static void my_canvas_get_pos(t_my_canvas *x) { ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) ! { ! x->x_at[0].a_w.w_float = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); ! x->x_at[1].a_w.w_float = text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); ! pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); } } static void my_canvas_size(t_my_canvas *x, t_symbol *s, int ac, t_atom *av) ! { ! int i = (int)atom_getintarg(0, ac, av); ! x->x_gui.x_w = x->x_gui.x_h = MAX(i,1); ! iemgui_size((t_iemgui *)x); ! } static void my_canvas_vis_size(t_my_canvas *x, t_symbol *s, int ac, t_atom *av) --- 30,43 ---- static void my_canvas_get_pos(t_my_canvas *x) { ! t_iemgui *y = (t_iemgui *)x; ! if(y->x_snd && y->x_snd->s_thing) { ! x->x_at[0].a_w.w_float = text_xpix(&y->x_obj, y->x_glist); ! x->x_at[1].a_w.w_float = text_ypix(&y->x_obj, y->x_glist); ! pd_list(y->x_snd->s_thing, &s_list, 2, x->x_at); } } static void my_canvas_size(t_my_canvas *x, t_symbol *s, int ac, t_atom *av) ! {x->x_gui.x_w = x->x_gui.x_h = MAX(1,atom_getintarg(0, ac, av)); iemgui_size((t_iemgui *)x);} static void my_canvas_vis_size(t_my_canvas *x, t_symbol *s, int ac, t_atom *av) *************** *** 49,53 **** x->x_vis_h = x->x_vis_w = MAX(1,(int)atom_getintarg(0, ac, av)); if(ac > 1) x->x_vis_h = MAX(1,(int)atom_getintarg(1, ac, av)); ! if(glist_isvisible(x->x_gui.x_glist)) iemgui_dodraw((t_iemgui *)x); } --- 45,49 ---- x->x_vis_h = x->x_vis_w = MAX(1,(int)atom_getintarg(0, ac, av)); if(ac > 1) x->x_vis_h = MAX(1,(int)atom_getintarg(1, ac, av)); ! pd_changed(x); } *************** *** 65,69 **** iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 61,65 ---- iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.31 retrieving revision 1.1.1.3.2.2.2.32 diff -C2 -d -r1.1.1.3.2.2.2.31 -r1.1.1.3.2.2.2.32 *** g_hslider.c 12 May 2004 10:25:02 -0000 1.1.1.3.2.2.2.31 --- g_hslider.c 13 May 2004 14:37:20 -0000 1.1.1.3.2.2.2.32 *************** *** 79,83 **** x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; ! iemgui_dodraw((t_iemgui *)x); } --- 79,83 ---- x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; ! pd_changed(x); } *************** *** 118,122 **** { t_iemgui *y = (t_iemgui *)x; - int v; binbuf_update(y,gensym(isvert(x)?"vsl":"hsl"),argc,argv); if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b", --- 118,121 ---- *************** *** 124,129 **** &y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, ! &y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&x->x_steady)) return; ! x->x_pos = x->x_val = y->x_isa&1 ? v : 0; iemgui_constrain(y); slider_check_minmax(x); --- 123,128 ---- &y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, ! &y->x_bcol,&y->x_fcol,&y->x_lcol,&x->x_val,&x->x_steady)) return; ! x->x_pos = x->x_val = y->x_isa&1 ? x->x_val : 0; iemgui_constrain(y); slider_check_minmax(x); *************** *** 131,135 **** else slider_check_width(x, y->x_w); if(y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 130,134 ---- else slider_check_width(x, y->x_w); if(y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } Index: g_dropper.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/g_dropper.c,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -C2 -d -r1.1.2.21 -r1.1.2.22 *** g_dropper.c 12 May 2004 09:13:18 -0000 1.1.2.21 --- g_dropper.c 13 May 2004 14:37:20 -0000 1.1.2.22 *************** *** 57,61 **** if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 57,61 ---- if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); iemgui_constrain(y); ! pd_changed(x); } Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.29 retrieving revision 1.1.1.3.2.2.2.30 diff -C2 -d -r1.1.1.3.2.2.2.29 -r1.1.1.3.2.2.2.30 *** g_bang.c 12 May 2004 10:25:02 -0000 1.1.1.3.2.2.2.29 --- g_bang.c 13 May 2004 14:37:20 -0000 1.1.1.3.2.2.2.30 *************** *** 99,103 **** iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 99,103 ---- iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.26 retrieving revision 1.1.1.4.2.2.2.27 diff -C2 -d -r1.1.1.4.2.2.2.26 -r1.1.1.4.2.2.2.27 *** g_numbox.c 12 May 2004 10:25:02 -0000 1.1.1.4.2.2.2.26 --- g_numbox.c 13 May 2004 14:37:20 -0000 1.1.1.4.2.2.2.27 *************** *** 13,17 **** #include "g_all_guis.h" #include <math.h> ! #define CH post("%d: change=%d", __LINE__, (int)x->x_change); static t_class *my_numbox_class; --- 13,18 ---- #include "g_all_guis.h" #include <math.h> ! //#define CH post("%d: change=%d", __LINE__, (int)x->x_change); ! #define CH static t_class *my_numbox_class; *************** *** 24,35 **** x->x_change = 0; CH glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); ! iemgui_dodraw((t_iemgui *)x); } ! static void my_numbox_tick_wait(t_my_numbox *x) ! {iemgui_dodraw((t_iemgui *)x);} ! ! void my_numbox_clip(t_my_numbox *x) ! {CLAMP(x->x_val,x->x_min,x->x_max);} void my_numbox_calc_fontwidth(t_my_numbox *x) --- 25,33 ---- x->x_change = 0; CH glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); ! pd_changed(x); } ! static void my_numbox_tick_wait(t_my_numbox *x) {pd_changed(x);} ! void my_numbox_clip(t_my_numbox *x) {CLAMP(x->x_val,x->x_min,x->x_max);} void my_numbox_calc_fontwidth(t_my_numbox *x) *************** *** 80,84 **** if(x->x_is_log) x->x_val *= pow(x->x_k, -k2*dy); else x->x_val -= k2*dy; my_numbox_clip(x); ! iemgui_dodraw((t_iemgui *)x); my_numbox_bang(x); clock_unset(x->x_clock_reset); --- 78,82 ---- if(x->x_is_log) x->x_val *= pow(x->x_k, -k2*dy); else x->x_val -= k2*dy; my_numbox_clip(x); ! pd_changed(x); my_numbox_bang(x); clock_unset(x->x_clock_reset); *************** *** 86,90 **** static void my_numbox_set(t_my_numbox *x, t_floatarg f) ! {x->x_val=f; my_numbox_clip(x); iemgui_dodraw((t_iemgui *)x);} static void my_numbox_log_height(t_my_numbox *x, t_floatarg lh) --- 84,88 ---- static void my_numbox_set(t_my_numbox *x, t_floatarg f) ! {x->x_val=f; my_numbox_clip(x); pd_changed(x);} static void my_numbox_log_height(t_my_numbox *x, t_floatarg lh) *************** *** 107,115 **** static void my_numbox_range(t_my_numbox *x, t_float min, t_float max) {x->x_min=min; x->x_max=max; ! if(my_numbox_check_minmax(x)) iemgui_dodraw((t_iemgui *)x);} static void my_numbox_lin(t_my_numbox *x) {x->x_is_log=0;} static void my_numbox_log(t_my_numbox *x) {x->x_is_log=1; ! if(my_numbox_check_minmax(x)) iemgui_dodraw((t_iemgui *)x);} static void my_numbox_loadbang(t_my_numbox *x) --- 105,113 ---- static void my_numbox_range(t_my_numbox *x, t_float min, t_float max) {x->x_min=min; x->x_max=max; ! if(my_numbox_check_minmax(x)) pd_changed(x);} static void my_numbox_lin(t_my_numbox *x) {x->x_is_log=0;} static void my_numbox_log(t_my_numbox *x) {x->x_is_log=1; ! if(my_numbox_check_minmax(x)) pd_changed(x);} static void my_numbox_loadbang(t_my_numbox *x) *************** *** 140,144 **** y->x_w = MAX(y->x_w,1); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! if (glist_isvisible(glist_getcanvas(y->x_glist))) iemgui_dodraw((t_iemgui *)x); } --- 138,142 ---- y->x_w = MAX(y->x_w,1); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); ! pd_changed(x); } 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.32 retrieving revision 1.1.1.4.2.2.2.33 diff -C2 -d -r1.1.1.4.2.2.2.32 -r1.1.1.4.2.2.2.33 *** g_all_guis.h 12 May 2004 10:35:43 -0000 1.1.1.4.2.2.2.32 --- g_all_guis.h 13 May 2004 14:37:20 -0000 1.1.1.4.2.2.2.33 *************** *** 141,145 **** EXTERN t_symbol *s_empty; EXTERN int convert_color2(int x); - EXTERN void iemgui_dodraw(t_iemgui *x); EXTERN void iemgui_init(t_iemgui *x, t_floatarg f); EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv); --- 141,144 ----

1 0

pd/doc/1.manual 1.introduction.txt,1.1.1.1,1.1.1.1.16.1
by Mathieu Bouchard 12 May '04

12 May '04

Update of /cvsroot/pure-data/pd/doc/1.manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22301 Modified Files: Tag: devel_0_37 1.introduction.txt Log Message: fixed typo Index: 1.introduction.txt =================================================================== RCS file: /cvsroot/pure-data/pd/doc/1.manual/1.introduction.txt,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.16.1 *** 1.introduction.txt 29 Jul 2002 17:06:01 -0000 1.1.1.1 --- 1.introduction.txt 12 May 2004 19:34:35 -0000 1.1.1.1.16.1 *************** *** 3,7 **** A real-time graphical programming environment for live interactive computer music, Pd works on SGI machines, Microsoft Windows, ! Linux, and Max OSX. Pd is copyrighted, but is free for you to use for any reasonable purpose. --- 3,7 ---- A real-time graphical programming environment for live interactive computer music, Pd works on SGI machines, Microsoft Windows, ! Linux, and Mac OSX. Pd is copyrighted, but is free for you to use for any reasonable purpose.

1 0

externals/miXed/cyclone/shadow dummies.c,1.6,1.7
by Krzysztof Czaja 12 May '04

12 May '04

Update of /cvsroot/pure-data/externals/miXed/cyclone/shadow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20056/miXed/cyclone/shadow Modified Files: dummies.c Log Message: mapping feature for ported names Index: dummies.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/cyclone/shadow/dummies.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dummies.c 17 Apr 2004 17:45:28 -0000 1.6 --- dummies.c 12 May 2004 15:01:35 -0000 1.7 *************** *** 1,3 **** ! /* Copyright (c) 2003 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ --- 1,3 ---- ! /* Copyright (c) 2003-2004 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 12,15 **** --- 12,16 ---- #include "m_pd.h" #include "common/loud.h" + #include "common/port.h" //#define DUMMIES_DEBUG *************** *** 17,20 **** --- 18,22 ---- static t_class *ccdummies_class; static int dummy_nclasses = 0; + static int pending_nclasses = 0; static t_class **dummy_classes; static int dummy_nreps = 0; *************** *** 22,26 **** typedef struct _dummy_slot { ! char *s_name; int s_nins; int s_nouts; --- 24,28 ---- typedef struct _dummy_slot { ! char *s_name; /* do not use after setup: invalid for mapped names */ int s_nins; int s_nouts; *************** *** 351,360 **** { "atanh", 1, 1, 0, 0 }, { "begin~", 0, 1, 0, 0 }, - { "Biquad~", 6, 1, 0, 0 }, /* LATER try mapping bpatcher to a gop abstraction/subpatch */ { "buffer~", 1, 2, 0, 0 }, { "cd", 1, 2, 0, 0 }, /* CHECKED (refman error?) */ { "cd~", 1, 6, 0, 0 }, /* CHECKED (refman error?) */ - { "Change", 1, 3, 0, 0 }, { "clocker", 2, 1, 0, 0 }, { "closebang", 0, 1, 0, 0 }, --- 353,360 ---- *************** *** 391,395 **** { "gestalt", 1, 2, 0, 0 }, { "Ggate", 2, 2, 0, 0 }, - /* LATER glove? */ { "graphic", 1, 0, 0, 0 }, { "groove~", 3, -1, 0, (t_newmethod)dummy_groove_tilde_new }, --- 391,394 ---- *************** *** 402,411 **** { "info~", 1, 8, 0, 0 }, /* CHECKME nouts */ { "ioscbank~", 4, 1, 0, 0 }, - { "Key", 0, 3, 0, 0 }, - { "Keyup", 0, 3, 0, 0 }, { "kslider", 2, 2, 0, 0 }, { "lcd", 1, 4, 0, 0 }, /* CHECKME nouts */ { "led", 1, 1, 0, 0 }, - { "Line", 3, 2, 0, 0 }, { "matrixctrl", 1, 1, 0, 0 }, /* CHECKME nins, nouts */ { "matrix~", -1, -1, 0, (t_newmethod)dummy_matrix_tilde_new }, --- 401,407 ---- *************** *** 439,462 **** { "pictslider", 2, 2, 0, 0 }, /* CHECKME one-dimensional mode */ { "playbar", 1, 2, 0, 0 }, /* CHECKME */ - { "plugconfig", 1, 0, 0, 0 }, - { "plugin~", 2, 2, 0, 0 }, - { "plugmidiin", 0, 1, 0, 0 }, - { "plugmidiout", 1, 0, 0, 0 }, - { "plugmod", 5, 3, 0, 0 }, - { "plugmorph", 2, 3, 0, 0 }, - { "plugmultiparam", 1, 2, 0, 0 }, - { "plugout~", 2, 2, 0, 0 }, /* CHECKME nouts */ - { "plugphasor~", 0, 1, 0, 0 }, /* CHECKME nouts */ - { "plugreceive~", 1, 1, 0, 0 }, - { "plugsend~", 1, 0, 0, 0 }, - { "plugstore", 1, 1, 0, 0 }, /* CHECKME nouts */ - { "plugsync~", 0, 9, 0, 0 }, /* CHECKME nouts */ - { "Poly", 2, 4, 0, 0 }, { "polyin", 1, 3, 0, 0 }, /* LATER parse args for nouts */ { "polyout", 3, 0, 0, 0 }, /* CHECKME nins */ /* LATER poly~ */ - { "pp", 2, 2, 0, 0 }, /* CHECKME nins */ - { "pptempo", 2, 2, 0, 0 }, - { "pptime", 4, 4, 0, 0 }, { "preset", 1, 3, 0, 0 }, { "radiogroup", 1, 1, 0, 0 }, --- 435,441 ---- *************** *** 465,469 **** { "rect", 6, 0, 0, 0 }, { "relativepath", 1, 1, 0, 0 }, - { "rewire~", 1, -1, 0, (t_newmethod)dummy_rewire_tilde_new }, { "ring", 6, 0, 0, 0 }, { "round~", 2, 1, 0, 0 }, --- 444,447 ---- *************** *** 480,484 **** { "sfplay~", 1, -1, 0, (t_newmethod)dummy_sfplay_tilde_new }, { "sfrecord~", -1, 0, 0, (t_newmethod)dummy_sfrecord_tilde_new }, - { "sndmgrin~", 0, 2, 0, 0 }, /* CHECKME */ { "strippath", 1, 2, 0, 0 }, { "stutter~", -1, -1, 0, (t_newmethod)dummy_stutter_tilde_new }, --- 458,461 ---- *************** *** 508,517 **** { "ubutton", 1, 4, 0, 0 }, { "umenu", 1, 2, 0, 0 }, - { "vdp", 3, 4, 0, 0 }, { "vexpr", -1, 1, 0, (t_newmethod)dummy_vexpr_new }, { "vpicture", 0, 0, 0, 0 }, - { "vst~", -1, -1, 0, (t_newmethod)dummy_vst_tilde_new }, { "waveform~", 5, 6, 0, 0 }, /* CHECKME */ { "zigzag~", 2, 4, 0, 0 }, { "_dummy", 0, 0, 0, 0 } }; --- 485,525 ---- { "ubutton", 1, 4, 0, 0 }, { "umenu", 1, 2, 0, 0 }, { "vexpr", -1, 1, 0, (t_newmethod)dummy_vexpr_new }, { "vpicture", 0, 0, 0, 0 }, { "waveform~", 5, 6, 0, 0 }, /* CHECKME */ { "zigzag~", 2, 4, 0, 0 }, + + /* mapped names (cf the structure `importmapping_default' in port.c) */ + /* clashing dummies go first */ + { "biquad~", 6, 1, 0, 0 }, + { "change", 1, 3, 0, 0 }, + { "key", 0, 3, 0, 0 }, + { "keyup", 0, 3, 0, 0 }, + { "line", 3, 2, 0, 0 }, + { "poly", 2, 4, 0, 0 }, + + /* remaining slots define `doomed' kind of dummies */ + { "appledvd", 1, 2, 0, 0 }, + /* LATER glove? */ + { "plugconfig", 1, 0, 0, 0 }, + { "plugin~", 2, 2, 0, 0 }, + { "plugmidiin", 0, 1, 0, 0 }, + { "plugmidiout", 1, 0, 0, 0 }, + { "plugmod", 5, 3, 0, 0 }, + { "plugmorph", 2, 3, 0, 0 }, + { "plugmultiparam", 1, 2, 0, 0 }, + { "plugout~", 2, 2, 0, 0 }, /* CHECKME nouts */ + { "plugphasor~", 0, 1, 0, 0 }, /* CHECKME nouts */ + { "plugreceive~", 1, 1, 0, 0 }, + { "plugsend~", 1, 0, 0, 0 }, + { "plugstore", 1, 1, 0, 0 }, /* CHECKME nouts */ + { "plugsync~", 0, 9, 0, 0 }, /* CHECKME nouts */ + { "pp", 2, 2, 0, 0 }, /* CHECKME nins */ + { "pptempo", 2, 2, 0, 0 }, + { "pptime", 4, 4, 0, 0 }, + { "rewire~", 1, -1, 0, (t_newmethod)dummy_rewire_tilde_new }, + { "sndmgrin~", 0, 2, 0, 0 }, /* CHECKME */ + { "vdp", 3, 4, 0, 0 }, + { "vst~", -1, -1, 0, (t_newmethod)dummy_vst_tilde_new }, { "_dummy", 0, 0, 0, 0 } }; *************** *** 576,579 **** --- 584,588 ---- if (!dummy_classes[i]) { + /* name field is valid here (reps are never mapped) */ int l = 1 + strlen(sl->s_name); if ((len += l) > 66) *************** *** 594,598 **** { t_dummy_slot *sl; ! int i; dummy_nclasses = sizeof(dummy_slots)/sizeof(*dummy_slots); /* never freed: */ --- 603,609 ---- { t_dummy_slot *sl; ! int i, mapsize; ! char **mapping = import_getmapping(&mapsize); ! int ndoomed = 0; dummy_nclasses = sizeof(dummy_slots)/sizeof(*dummy_slots); /* never freed: */ *************** *** 602,605 **** --- 613,625 ---- int fd; char dirbuf[MAXPDSTRING], *nameptr; + char *name = port_usemapping(sl->s_name, mapsize, mapping); + if (name) + ndoomed++; + else if (ndoomed && i < dummy_nclasses - 1) + { + bug("dummies_setup"); + post("(\"%s\": clashing or doomed dummy not registered for import)", + sl->s_name); + } if ((fd = open_via_path("", sl->s_name, ".pd", dirbuf, &nameptr, MAXPDSTRING, 0)) >= 0) *************** *** 609,617 **** } else dummy_classes[i] = ! class_new(gensym(sl->s_name), sl->s_method ? sl->s_method : (t_newmethod)dummy_new, 0, sizeof(t_object), (sl->s_nins ? 0 : CLASS_NOINLET), A_GIMME, 0); } dummy_nclasses--; /* use "_dummy" as a sentinel */ --- 629,639 ---- } else + { dummy_classes[i] = ! class_new((name ? gensym(name) : gensym(sl->s_name)), sl->s_method ? sl->s_method : (t_newmethod)dummy_new, 0, sizeof(t_object), (sl->s_nins ? 0 : CLASS_NOINLET), A_GIMME, 0); + } } dummy_nclasses--; /* use "_dummy" as a sentinel */

1 0

externals/miXed/shared/common binport.c,1.4,1.5 port.c,1.12,1.13 port.h,1.1.1.1,1.2
by Krzysztof Czaja 12 May '04

12 May '04

Update of /cvsroot/pure-data/externals/miXed/shared/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20056/miXed/shared/common Modified Files: binport.c port.c port.h Log Message: mapping feature for ported names Index: port.h =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/common/port.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** port.h 23 May 2003 12:29:52 -0000 1.1.1.1 --- port.h 12 May 2004 15:01:35 -0000 1.2 *************** *** 1,3 **** ! /* Copyright (c) 2003 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ --- 1,3 ---- ! /* Copyright (c) 2003-2004 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 7,10 **** --- 7,13 ---- void import_max(char *fn, char *dir); + void import_setmapping(int size, char **mapping); + char **import_getmapping(int *sizep); + char *port_usemapping(char *from, int mapsize, char **mapping); #endif Index: port.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/common/port.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** port.c 23 Apr 2004 11:25:53 -0000 1.12 --- port.c 12 May 2004 15:01:35 -0000 1.13 *************** *** 93,96 **** --- 93,173 ---- static t_symbol *portps_picture; + static char *import_defmapping[] = + { + /* clashing clones */ + "append", "Append", + "b", "bangbang", + "clip", "Clip", + "clip~", "Clip~", + "line~", "Line~", + "scope~", "Scope~", + "snapshot~", "Snapshot~", + + /* clashing dummies */ + "biquad~", "Biquad~", + "change", "Change", + "key", "Key", + "keyup", "Keyup", + "line", "Line", + "poly", "Poly", + + /* doomed dummies */ + "appledvd", "c74.appledvd", + "plugconfig", "c74.plugconfig", + "plugin~", "c74.plugin~", + "plugmidiin", "c74.plugmidiin", + "plugmidiout", "c74.plugmidiout", + "plugmod", "c74.plugmod", + "plugmorph", "c74.plugmorph", + "plugmultiparam", "c74.plugmultiparam", + "plugout~", "c74.plugout~", + "plugphasor~", "c74.plugphasor~", + "plugreceive~", "c74.plugreceive~", + "plugsend~", "c74.plugsend~", + "plugstore", "c74.plugstore", + "plugsync~", "c74.plugsync~", + "pp", "c74.pp", + "pptempo", "c74.pptempo", + "pptime", "c74.pptime", + "rewire~", "c74.rewire~", + "sndmgrin~", "c74.sndmgrin~", + "vdp", "c74.vdp", + "vst~", "c74.vst~" + }; + + static int import_mapsize = 0; + static char **import_mapping = 0; + + static void import_setdefmapping(void) + { + import_mapsize = sizeof(import_defmapping)/(2 * sizeof(*import_defmapping)); + import_mapping = import_defmapping; + } + + void import_setmapping(int size, char **mapping) + { + import_mapsize = size; + import_mapping = mapping; + } + + char **import_getmapping(int *sizep) + { + if (!import_mapping) import_setdefmapping(); + *sizep = import_mapsize; + return (import_mapping); + } + + char *port_usemapping(char *from, int mapsize, char **mapping) + { + while (mapsize--) + { + if (strcmp(*mapping, from)) + mapping += 2; + else + return (mapping[1]); + } + return (0); + } + static t_int port_getint(t_port *x, int ndx) { *************** *** 393,400 **** else { if (inatom->a_type == A_SYMBOL) { /* LATER bash inatom to lowercase (CHECKME first) */ ! t_symbol *insym = inatom->a_w.w_symbol; if (insym != &s_bang && insym != &s_float && insym != &s_symbol && insym != &s_list && --- 470,497 ---- else { + t_symbol *insym = 0; if (inatom->a_type == A_SYMBOL) { /* LATER bash inatom to lowercase (CHECKME first) */ ! insym = inatom->a_w.w_symbol; ! if (import_mapping && import_mapsize) ! { ! char **fromp = import_mapping, **top = import_mapping + 1; ! int cnt = import_mapsize; ! while (cnt--) ! { ! if (strcmp(*fromp, insym->s_name)) ! { ! fromp += 2; ! top += 2; ! } ! else ! { ! insym = gensym(*top); ! inatom = 0; ! break; ! } ! } ! } if (insym != &s_bang && insym != &s_float && insym != &s_symbol && insym != &s_list && *************** *** 407,411 **** } } ! import_copyatoms(&at, inatom, 1); } binbuf_add(x->x_outbb, 1, &at); --- 504,516 ---- } } ! if (inatom) ! import_copyatoms(&at, inatom, 1); ! else if (insym) ! SETSYMBOL(&at, insym); ! else ! { ! bug("import_addclassname"); ! SETSYMBOL(&at, gensym("???")); ! } } binbuf_add(x->x_outbb, 1, &at); *************** *** 922,936 **** static t_portslot imslots_newex[] = { - { "append", import_objarg, "Append", 0, 0 }, - { "biquad~", import_objarg, "Biquad~", 0, 0 }, - { "change", import_objarg, "Change", 0, 0 }, - { "clip", import_objarg, "Clip", 0, 0 }, - { "clip~", import_objarg, "Clip~", 0, 0 }, { "key", import_obj, "Key", 0, 0 }, { "keyup", import_obj, "Keyup", 0, 0 }, - { "line", import_objarg, "Line", 0, 0 }, - { "line~", import_objarg, "Line~", 0, 0 }, - { "poly", import_objarg, "Poly", 0, 0 }, - { "snapshot~", import_objarg, "Snapshot~", 0, 0 }, { "pack", imaction_P6_pack, 0, 0, 0 }, --- 1027,1032 ---- *************** *** 1125,1128 **** --- 1221,1225 ---- port_dochecksetup(subtree); } + import_setdefmapping(); } Index: binport.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/common/binport.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** binport.c 17 Apr 2004 17:45:28 -0000 1.4 --- binport.c 12 May 2004 15:01:35 -0000 1.5 *************** *** 246,255 **** else if (ex || hi || lo) { ! double d; ex -= 0x401e; ! hi = ((hi - 0x7fffffff) - 1) + ((float)0x7fffffff + 1.); ! lo = ((lo - 0x7fffffff) - 1) + ((float)0x7fffffff + 1.); ! d = ldexp(hi, ex) + ldexp(lo, ex - 32); ! *fptr = ((word[0] & 0x80) ? -(float)d : (float)d); } else *fptr = 0.; --- 246,255 ---- else if (ex || hi || lo) { ! double dhi, dlo, dabs; ex -= 0x401e; ! dhi = (double)((hi - 0x7fffffff) - 1) + ((float)0x7fffffff + 1.); ! dlo = (double)((lo - 0x7fffffff) - 1) + ((float)0x7fffffff + 1.); ! dabs = ldexp(dhi, ex) + ldexp(dlo, ex - 32); ! *fptr = ((word[0] & 0x80) ? -(float)dabs : (float)dabs); } else *fptr = 0.; *************** *** 680,684 **** binport_setint(ap, atoi(buf)); else if (floatstate == 4 || floatstate == 5 || floatstate == 8) ! binport_setfloat(ap, atof(buf)); else binport_setsymbol(ap, gensym(buf)); --- 680,684 ---- binport_setint(ap, atoi(buf)); else if (floatstate == 4 || floatstate == 5 || floatstate == 8) ! binport_setfloat(ap, (float)atof(buf)); else binport_setsymbol(ap, gensym(buf));

1 0

externals/miXed/ViCious/cyclone objects,1.2,1.3
by Krzysztof Czaja 12 May '04

12 May '04

Update of /cvsroot/pure-data/externals/miXed/ViCious/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20056/miXed/ViCious/cyclone Modified Files: objects Log Message: mapping feature for ported names Index: objects =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/ViCious/cyclone/objects,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** objects 17 Apr 2004 17:45:26 -0000 1.2 --- objects 12 May 2004 15:01:34 -0000 1.3 *************** *** 208,212 **** DUMMIES_OBJECTS = \ $(SRCDIR)\shadow\dummies.obj \ ! $(SHAREDDIR)\common\loud.obj CYCLIST_OBJECTS = \ --- 208,218 ---- DUMMIES_OBJECTS = \ $(SRCDIR)\shadow\dummies.obj \ ! $(SHAREDDIR)\common\loud.obj \ ! $(SHAREDDIR)\common\grow.obj \ ! $(SHAREDDIR)\common\binport.obj \ ! $(SHAREDDIR)\common\port.obj \ ! $(SHAREDDIR)\unstable\forky.obj \ ! $(SHAREDDIR)\unstable\fragile.obj \ ! $(SHAREDDIR)\unstable\fringe.obj CYCLIST_OBJECTS = \

1 0

externals/miXed/cyclone build_counter,1.7,1.8 cyclone-test.exclude,1.2,1.3
by Krzysztof Czaja 12 May '04

12 May '04

Update of /cvsroot/pure-data/externals/miXed/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20056/miXed/cyclone Modified Files: build_counter cyclone-test.exclude Log Message: mapping feature for ported names Index: build_counter =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/cyclone/build_counter,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build_counter 31 Mar 2004 10:24:17 -0000 1.7 --- build_counter 12 May 2004 15:01:34 -0000 1.8 *************** *** 1,7 **** #define CYCLONE_VERSION "0.1" #define CYCLONE_RELEASE "alpha" ! #define CYCLONE_BUILD 48 #if 0 ! CYCLONE_SNAPSHOT = 0.1-alpha48 #endif --- 1,7 ---- #define CYCLONE_VERSION "0.1" #define CYCLONE_RELEASE "alpha" ! #define CYCLONE_BUILD 49 #if 0 ! CYCLONE_SNAPSHOT = 0.1-alpha49 #endif Index: cyclone-test.exclude =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/cyclone/cyclone-test.exclude,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cyclone-test.exclude 14 Aug 2003 14:26:06 -0000 1.2 --- cyclone-test.exclude 12 May 2004 15:01:34 -0000 1.3 *************** *** 1,3 **** --- 1,4 ---- *~ + *.pict import-result.pd import-debug.pd

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.36,1.1.1.4.2.4.2.37 g_all_guis.h,1.1.1.4.2.2.2.31,1.1.1.4.2.2.2.32 g_vumeter.c,1.1.1.3.2.2.2.21,1.1.1.3.2.2.2.22
by Mathieu Bouchard 12 May '04

12 May '04

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); }

1 0

pd/src g_all_guis.h,1.1.1.4.2.2.2.30,1.1.1.4.2.2.2.31 g_all_guis.c,1.1.1.4.2.4.2.35,1.1.1.4.2.4.2.36 g_bang.c,1.1.1.3.2.2.2.28,1.1.1.3.2.2.2.29 g_hdial.c,1.1.1.4.2.2.2.25,1.1.1.4.2.2.2.26 g_hslider.c,1.1.1.3.2.2.2.30,1.1.1.3.2.2.2.31 g_numbox.c,1.1.1.4.2.2.2.25,1.1.1.4.2.2.2.26 g_toggle.c,1.1.1.3.2.2.2.24,1.1.1.3.2.2.2.25
by Mathieu Bouchard 12 May '04

12 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22864 Modified Files: Tag: impd_0_37 g_all_guis.h g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_numbox.c g_toggle.c Log Message: removing x_put_in2out from t_iemgui Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.24 retrieving revision 1.1.1.3.2.2.2.25 diff -C2 -d -r1.1.1.3.2.2.2.24 -r1.1.1.3.2.2.2.25 *** g_toggle.c 12 May 2004 09:13:18 -0000 1.1.1.3.2.2.2.24 --- g_toggle.c 12 May 2004 10:25:02 -0000 1.1.1.3.2.2.2.25 *************** *** 52,56 **** static void toggle_float(t_toggle *x, t_floatarg f) ! {toggle_set(x, f); if(x->x_gui.x_put_in2out) toggle_action(x);} static void toggle_fout(t_toggle *x, t_floatarg f) --- 52,56 ---- static void toggle_float(t_toggle *x, t_floatarg f) ! {toggle_set(x, f); if(iemgui_forward(x)) toggle_action(x);} static void toggle_fout(t_toggle *x, t_floatarg f) Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.25 retrieving revision 1.1.1.4.2.2.2.26 diff -C2 -d -r1.1.1.4.2.2.2.25 -r1.1.1.4.2.2.2.26 *** g_hdial.c 12 May 2004 09:13:18 -0000 1.1.1.4.2.2.2.25 --- g_hdial.c 12 May 2004 10:25:02 -0000 1.1.1.4.2.2.2.26 *************** *** 102,106 **** { /* compatibility with earlier "vdial" behavior */ ! if (x->x_change && i!=x->x_on_old && x->x_gui.x_put_in2out) radio_send2(x,x->x_on_old,0.0); x->x_on_old = x->x_on; --- 102,106 ---- { /* compatibility with earlier "vdial" behavior */ ! if (x->x_change && i!=x->x_on_old && iemgui_forward(x)) radio_send2(x,x->x_on_old,0.0); x->x_on_old = x->x_on; *************** *** 108,115 **** iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; ! if(x->x_gui.x_put_in2out) radio_send2(x,x->x_on,1.0); } else { x->x_on = i; ! if (x->x_gui.x_put_in2out) radio_send(x,x->x_on); iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; --- 108,115 ---- iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; ! if(iemgui_forward(x)) radio_send2(x,x->x_on,1.0); } else { x->x_on = i; ! if (iemgui_forward(x)) radio_send(x,x->x_on); iemgui_dodraw((t_iemgui *)x); x->x_on_old = x->x_on; 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.35 retrieving revision 1.1.1.4.2.4.2.36 diff -C2 -d -r1.1.1.4.2.4.2.35 -r1.1.1.4.2.4.2.36 *** g_all_guis.c 12 May 2004 10:06:58 -0000 1.1.1.4.2.4.2.35 --- g_all_guis.c 12 May 2004 10:25:02 -0000 1.1.1.4.2.4.2.36 *************** *** 59,65 **** int iemgui_clip_font(int size) {return MAX(size,IEM_FONT_MINSIZE);} - void iemgui_verify_snd_ne_rcv(t_iemgui *x) - {x->x_put_in2out = !x->x_snd || !x->x_rcv || x->x_snd != x->x_rcv;} - t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv) { --- 59,62 ---- *************** *** 89,93 **** x->x_snd = canvas_realizedollar(x->x_glist, s); if (x->x_snd==s_empty) x->x_snd=0; - iemgui_verify_snd_ne_rcv(x); iemgui_dodraw(x); } --- 86,89 ---- *************** *** 107,111 **** x->x_rcv = rcv; } - iemgui_verify_snd_ne_rcv(x); if(glist_isvisible(x->x_glist)) iemgui_dodraw(x); } --- 103,106 ---- *************** *** 350,354 **** x->x_font_style = 0; x->x_fontsize = 8; - x->x_put_in2out = 1; x->x_snd = 0; x->x_rcv = 0; --- 345,348 ---- *************** *** 380,384 **** x->x_h = iemgui_clip_size(x->x_h); x->x_w = iemgui_clip_size(x->x_w); - iemgui_verify_snd_ne_rcv(x); } --- 374,377 ---- *************** *** 400,401 **** --- 393,399 ---- return !sys_noloadbang && self->x_isa&1; } + + EXTERN /*bool*/ int iemgui_forward (/*t_iemgui*/ void *x) { + t_iemgui *self = (t_iemgui *)x; + return !self->x_snd || !self->x_rcv || self->x_snd != self->x_rcv; + } Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.30 retrieving revision 1.1.1.3.2.2.2.31 diff -C2 -d -r1.1.1.3.2.2.2.30 -r1.1.1.3.2.2.2.31 *** g_hslider.c 12 May 2004 10:06:58 -0000 1.1.1.3.2.2.2.30 --- g_hslider.c 12 May 2004 10:25:02 -0000 1.1.1.3.2.2.2.31 *************** *** 111,115 **** static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;} static void slider_float(t_slider *x, t_floatarg f) ! {slider_set(x, f); if(x->x_gui.x_put_in2out) slider_bang(x);} static void slider_loadbang(t_slider *x) {if(iemgui_loadbang(x)) slider_bang(x);} --- 111,115 ---- static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;} static void slider_float(t_slider *x, t_floatarg f) ! {slider_set(x, f); if(iemgui_forward(x)) slider_bang(x);} static void slider_loadbang(t_slider *x) {if(iemgui_loadbang(x)) slider_bang(x);} 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.30 retrieving revision 1.1.1.4.2.2.2.31 diff -C2 -d -r1.1.1.4.2.2.2.30 -r1.1.1.4.2.2.2.31 *** g_all_guis.h 12 May 2004 10:06:58 -0000 1.1.1.4.2.2.2.30 --- g_all_guis.h 12 May 2004 10:25:02 -0000 1.1.1.4.2.2.2.31 *************** *** 22,26 **** int x_ldx, x_ldy; int x_isa; /* bit 0: loadinit; bit 20: scale */ - unsigned x_put_in2out:1; int x_font_style, x_fontsize; int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */ --- 22,25 ---- *************** *** 33,38 **** int x_flashed; int x_locked; ! int x_flashtime_break; ! int x_flashtime_hold; t_clock *x_clock_hld; t_clock *x_clock_brk; --- 32,37 ---- int x_flashed; int x_locked; ! int x_ftbreak; /* flash time break (ms) */ ! int x_fthold; /* flash time hold (ms) */ t_clock *x_clock_hld; t_clock *x_clock_brk; *************** *** 119,123 **** EXTERN int iemgui_clip_size(int size); EXTERN int iemgui_clip_font(int size); - EXTERN void iemgui_verify_snd_ne_rcv(t_iemgui *iemgui); EXTERN t_symbol *iemgui_new_dogetname(t_iemgui *iemgui, int indx, t_atom *argv); EXTERN void iemgui_size(t_iemgui *x); --- 118,121 ---- *************** *** 149,150 **** --- 147,149 ---- EXTERN void binbuf_update(t_iemgui *x, t_symbol *qlass, int argc, t_atom *argv); EXTERN /*bool*/ int iemgui_loadbang (/*t_iemgui*/ void *x); + EXTERN /*bool*/ int iemgui_forward (/*t_iemgui*/ void *x); /* was x_put_in2out */ Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.28 retrieving revision 1.1.1.3.2.2.2.29 diff -C2 -d -r1.1.1.3.2.2.2.28 -r1.1.1.3.2.2.2.29 *** g_bang.c 12 May 2004 09:13:17 -0000 1.1.1.3.2.2.2.28 --- g_bang.c 12 May 2004 10:25:02 -0000 1.1.1.3.2.2.2.29 *************** *** 30,37 **** } ! void bng_check_minmax(t_bng *x, int ftbreak, int fthold) { ! if(ftbreak > fthold) {int h = ftbreak; ftbreak = fthold; fthold = h;} ! x->x_flashtime_break = MAX(ftbreak,10); ! x->x_flashtime_hold = MAX(fthold, 50); } --- 30,41 ---- } ! static void bng_check_minmax(t_bng *x) { ! if(x->x_ftbreak > x->x_fthold) { ! int h = x->x_ftbreak; ! x->x_ftbreak = x->x_fthold; ! x->x_fthold = h; ! } ! x->x_ftbreak = MAX(x->x_ftbreak,10); ! x->x_fthold = MAX(x->x_fthold, 50); } *************** *** 40,44 **** if(x->x_flashed) { x->x_flashed = 0; ! clock_delay(x->x_clock_brk, x->x_flashtime_break); } else { t_canvas *glist = ((t_iemgui *)x)->x_glist; --- 44,48 ---- if(x->x_flashed) { x->x_flashed = 0; ! clock_delay(x->x_clock_brk, x->x_ftbreak); } else { t_canvas *glist = ((t_iemgui *)x)->x_glist; *************** *** 46,55 **** } x->x_flashed = 1; ! clock_delay(x->x_clock_hld, x->x_flashtime_hold); } static void bng_bout2(t_bng *x) { ! if(!x->x_gui.x_put_in2out) {x->x_locked=1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing); --- 50,59 ---- } x->x_flashed = 1; ! clock_delay(x->x_clock_hld, x->x_fthold); } static void bng_bout2(t_bng *x) { ! if(!iemgui_forward(x)) {x->x_locked=1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing); *************** *** 60,75 **** if(x->x_locked) return; bng_set(x); ! if(!x->x_gui.x_put_in2out) {x->x_locked = 1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing && x->x_gui.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing); ! } ! static void bng_bang2(t_bng *x) { ! if(x->x_locked) return; ! bng_set(x); ! bng_bout2(x); } ! ! static void bng_loadbang(t_bng *x) ! {if(iemgui_loadbang(x)) {bng_set(x); bng_bout2(x);}} static void bng_size(t_bng *x, t_symbol *s, int ac, t_atom *av) --- 64,73 ---- if(x->x_locked) return; bng_set(x); ! if(!iemgui_forward(x)) {x->x_locked = 1; clock_delay(x->x_clock_lck, 2);} outlet_bang(x->x_gui.x_obj.ob_outlet); ! if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing && iemgui_forward(x)) pd_bang(x->x_gui.x_snd->s_thing); } ! static void bng_bang2 (t_bng *x) {if(!x->x_locked) {bng_set(x); bng_bout2(x);}} ! static void bng_loadbang(t_bng *x) {if(iemgui_loadbang(x)) {bng_set(x); bng_bout2(x);}} static void bng_size(t_bng *x, t_symbol *s, int ac, t_atom *av) *************** *** 79,87 **** } ! static void bng_flashtime(t_bng *x, t_symbol *s, int ac, t_atom *av) ! { ! bng_check_minmax(x, ! (int)atom_getintarg(0, ac, av), ! (int)atom_getintarg(1, ac, av)); } --- 77,84 ---- } ! static void bng_flashtime(t_bng *x, t_symbol *s, int ac, t_atom *av) { ! x->x_ftbreak = atom_getintarg(0, ac, av); ! x->x_fthold = atom_getintarg(1, ac, av); ! bng_check_minmax(x); } *************** *** 95,103 **** binbuf_update(y,gensym("bng"),argc,argv); if (!pd_scanargs(argc,argv,"iiiiaaaiiiiccc", ! &y->x_w,&x->x_flashtime_hold,&x->x_flashtime_break,&y->x_isa,&y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol)) return; y->x_h = y->x_w; ! bng_check_minmax(x, x->x_flashtime_break, x->x_flashtime_hold); iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); --- 92,100 ---- binbuf_update(y,gensym("bng"),argc,argv); if (!pd_scanargs(argc,argv,"iiiiaaaiiiiccc", ! &y->x_w,&x->x_fthold,&x->x_ftbreak,&y->x_isa,&y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol)) return; y->x_h = y->x_w; ! bng_check_minmax(x); iemgui_constrain(y); if (y->x_rcv) pd_bind((t_pd *)x, y->x_rcv); *************** *** 109,115 **** t_iemgui *y = iemgui_new(bng_class); t_bng *x = (t_bng *)y; ! x->x_flashtime_break = 250; ! x->x_flashtime_hold = 50; ! bng_check_minmax(x, x->x_flashtime_break, x->x_flashtime_hold); x->x_flashed = 0; x->x_locked = 0; --- 106,112 ---- t_iemgui *y = iemgui_new(bng_class); t_bng *x = (t_bng *)y; ! x->x_ftbreak = 250; ! x->x_fthold = 50; ! bng_check_minmax(x); x->x_flashed = 0; x->x_locked = 0; Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.25 retrieving revision 1.1.1.4.2.2.2.26 diff -C2 -d -r1.1.1.4.2.2.2.25 -r1.1.1.4.2.2.2.26 *** g_numbox.c 12 May 2004 10:06:58 -0000 1.1.1.4.2.2.2.25 --- g_numbox.c 12 May 2004 10:25:02 -0000 1.1.1.4.2.2.2.26 *************** *** 95,99 **** static void my_numbox_float(t_my_numbox *x, t_floatarg f) ! {my_numbox_set(x, f); if(x->x_gui.x_put_in2out) my_numbox_bang(x);} static void my_numbox_size(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) --- 95,99 ---- static void my_numbox_float(t_my_numbox *x, t_floatarg f) ! {my_numbox_set(x, f); if(iemgui_forward(x)) my_numbox_bang(x);} static void my_numbox_size(t_my_numbox *x, t_symbol *s, int ac, t_atom *av)

1 0

pd/src g_all_guis.h,1.1.1.4.2.2.2.29,1.1.1.4.2.2.2.30 g_all_guis.c,1.1.1.4.2.4.2.34,1.1.1.4.2.4.2.35 g_hslider.c,1.1.1.3.2.2.2.29,1.1.1.3.2.2.2.30 g_numbox.c,1.1.1.4.2.2.2.24,1.1.1.4.2.2.2.25
by Mathieu Bouchard 12 May '04

12 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19172 Modified Files: Tag: impd_0_37 g_all_guis.h g_all_guis.c g_hslider.c g_numbox.c Log Message: removing t_iemgui's x_lin0_log1 Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.29 retrieving revision 1.1.1.3.2.2.2.30 diff -C2 -d -r1.1.1.3.2.2.2.29 -r1.1.1.3.2.2.2.30 *** g_hslider.c 12 May 2004 09:20:26 -0000 1.1.1.3.2.2.2.29 --- g_hslider.c 12 May 2004 10:06:58 -0000 1.1.1.3.2.2.2.30 *************** *** 45,49 **** double l = (double)(isvert(x) ? x->x_gui.x_h : x->x_gui.x_w)-1; int m = l*100; ! double span = x->x_gui.x_lin0_log1 ? log(x->x_max/x->x_min) : (x->x_max - x->x_min); if(w < IEM_SL_MINSIZE) w = IEM_SL_MINSIZE; if (isvert(x)) {x->x_gui.x_h=w;} else {x->x_gui.x_w=w;} --- 45,49 ---- double l = (double)(isvert(x) ? x->x_gui.x_h : x->x_gui.x_w)-1; int m = l*100; ! double span = x->x_is_log ? log(x->x_max/x->x_min) : (x->x_max - x->x_min); if(w < IEM_SL_MINSIZE) w = IEM_SL_MINSIZE; if (isvert(x)) {x->x_gui.x_h=w;} else {x->x_gui.x_w=w;} *************** *** 56,60 **** double min=x->x_min, max=x->x_max; double diff; ! if(x->x_gui.x_lin0_log1) { if(min == 0.0 && max == 0.0) max = 1.0; if(max > 0.0) { if (min<=0.0) min = 0.01*max; } --- 56,60 ---- double min=x->x_min, max=x->x_max; double diff; ! if(x->x_is_log) { if(min == 0.0 && max == 0.0) max = 1.0; if(max > 0.0) { if (min<=0.0) min = 0.01*max; } *************** *** 63,67 **** x->x_min = min; x->x_max = max; ! diff = x->x_gui.x_lin0_log1 ? log(x->x_max/x->x_min) : (x->x_max-x->x_min); x->x_k = isvert(x) ? diff/(double)(x->x_gui.x_h-1) : --- 63,67 ---- x->x_min = min; x->x_max = max; ! diff = x->x_is_log ? log(x->x_max/x->x_min) : (x->x_max-x->x_min); x->x_k = isvert(x) ? diff/(double)(x->x_gui.x_h-1) : *************** *** 76,80 **** else { /* normal */ CLAMP(f,x->x_min,x->x_max); } ! g = (x->x_gui.x_lin0_log1 ? log(f/x->x_min) : (f-x->x_min)) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; --- 76,80 ---- else { /* normal */ CLAMP(f,x->x_min,x->x_max); } ! g = (x->x_is_log ? log(f/x->x_min) : (f-x->x_min)) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; *************** *** 84,88 **** static void slider_bang(t_slider *x) { ! double out = x->x_gui.x_lin0_log1 ? x->x_min*exp(x->x_k*(double)(x->x_val)*0.01) : (double)(x->x_val)*0.01*x->x_k + x->x_min; --- 84,88 ---- static void slider_bang(t_slider *x) { ! double out = x->x_is_log ? x->x_min*exp(x->x_k*(double)(x->x_val)*0.01) : (double)(x->x_val)*0.01*x->x_k + x->x_min; *************** *** 107,112 **** static void slider_range(t_slider *x, t_float min, t_float max) {x->x_min = min; x->x_max = max; slider_check_minmax(x);} ! static void slider_lin(t_slider *x) {x->x_gui.x_lin0_log1 = 0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w)-1);} ! static void slider_log(t_slider *x) {x->x_gui.x_lin0_log1 = 1; slider_check_minmax(x);} static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;} static void slider_float(t_slider *x, t_floatarg f) --- 107,112 ---- static void slider_range(t_slider *x, t_float min, t_float max) {x->x_min = min; x->x_max = max; slider_check_minmax(x);} ! static void slider_lin(t_slider *x) {x->x_is_log=0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w)-1);} ! static void slider_log(t_slider *x) {x->x_is_log=1; slider_check_minmax(x);} static void slider_steady(t_slider *x, t_floatarg f) {x->x_steady = !!f;} static void slider_float(t_slider *x, t_floatarg f) *************** *** 118,130 **** { t_iemgui *y = (t_iemgui *)x; ! int v,lilo; binbuf_update(y,gensym(isvert(x)?"vsl":"hsl"),argc,argv); if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b", ! &y->x_w,&y->x_h,&x->x_min,&x->x_max,&lilo,&y->x_isa, &y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&x->x_steady)) return; x->x_pos = x->x_val = y->x_isa&1 ? v : 0; - y->x_lin0_log1 = lilo; iemgui_constrain(y); slider_check_minmax(x); --- 118,129 ---- { t_iemgui *y = (t_iemgui *)x; ! int v; binbuf_update(y,gensym(isvert(x)?"vsl":"hsl"),argc,argv); if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b", ! &y->x_w,&y->x_h,&x->x_min,&x->x_max,&x->x_is_log,&y->x_isa, &y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&x->x_steady)) return; x->x_pos = x->x_val = y->x_isa&1 ? v : 0; iemgui_constrain(y); slider_check_minmax(x); *************** *** 140,143 **** --- 139,143 ---- t_slider *x = (t_slider *)y; x->x_flavor=s; + x->x_is_log=0; x->x_min=0.0; x->x_steady=0; 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.29 retrieving revision 1.1.1.4.2.2.2.30 diff -C2 -d -r1.1.1.4.2.2.2.29 -r1.1.1.4.2.2.2.30 *** g_all_guis.h 12 May 2004 09:58:11 -0000 1.1.1.4.2.2.2.29 --- g_all_guis.h 12 May 2004 10:06:58 -0000 1.1.1.4.2.2.2.30 *************** *** 22,26 **** int x_ldx, x_ldy; int x_isa; /* bit 0: loadinit; bit 20: scale */ ! unsigned x_put_in2out:1,x_lin0_log1:1; int x_font_style, x_fontsize; int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */ --- 22,26 ---- int x_ldx, x_ldy; int x_isa; /* bit 0: loadinit; bit 20: scale */ ! unsigned x_put_in2out:1; int x_font_style, x_fontsize; int x_fcol, x_bcol, x_lcol; /* foreground, background, label colors */ *************** *** 50,53 **** --- 50,54 ---- double x_k; int x_steady; + int x_is_log; } t_slider; *************** *** 112,115 **** --- 113,117 ---- int x_finemoved; int x_change; + int x_is_log; } t_my_numbox; Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.24 retrieving revision 1.1.1.4.2.2.2.25 diff -C2 -d -r1.1.1.4.2.2.2.24 -r1.1.1.4.2.2.2.25 *** g_numbox.c 12 May 2004 09:20:26 -0000 1.1.1.4.2.2.2.24 --- g_numbox.c 12 May 2004 10:06:58 -0000 1.1.1.4.2.2.2.25 *************** *** 56,60 **** double min=x->x_min, max=x->x_max; int val=x->x_val; ! if(x->x_gui.x_lin0_log1) { if(min==0.0 && max==0.0) max = 1.0; if(max>0.0 && min<=0.0) min = 0.01*max; --- 56,60 ---- double min=x->x_min, max=x->x_max; int val=x->x_val; ! if(x->x_is_log) { if(min==0.0 && max==0.0) max = 1.0; if(max>0.0 && min<=0.0) min = 0.01*max; *************** *** 64,68 **** x->x_max = max; CLAMP(x->x_val,x->x_min,x->x_max); ! x->x_k = x->x_gui.x_lin0_log1 ? exp(log(x->x_max/x->x_min)/(double)(x->x_log_height)) : 1.0; return x->x_val!=val; } --- 64,68 ---- x->x_max = max; CLAMP(x->x_val,x->x_min,x->x_max); ! x->x_k = x->x_is_log ? exp(log(x->x_max/x->x_min)/(double)(x->x_log_height)) : 1.0; return x->x_val!=val; } *************** *** 78,82 **** { double k2= x->x_finemoved ? 0.01 : 1.0; ! if(x->x_gui.x_lin0_log1) x->x_val *= pow(x->x_k, -k2*dy); else x->x_val -= k2*dy; my_numbox_clip(x); iemgui_dodraw((t_iemgui *)x); --- 78,82 ---- { double k2= x->x_finemoved ? 0.01 : 1.0; ! if(x->x_is_log) x->x_val *= pow(x->x_k, -k2*dy); else x->x_val -= k2*dy; my_numbox_clip(x); iemgui_dodraw((t_iemgui *)x); *************** *** 91,95 **** { x->x_log_height = MAX(10.0,(int)lh); ! x->x_k = x->x_gui.x_lin0_log1 ? exp(log(x->x_max/x->x_min)/(double)(x->x_log_height)) : 1.0; } --- 91,95 ---- { x->x_log_height = MAX(10.0,(int)lh); ! x->x_k = x->x_is_log ? exp(log(x->x_max/x->x_min)/(double)(x->x_log_height)) : 1.0; } *************** *** 109,114 **** if(my_numbox_check_minmax(x)) iemgui_dodraw((t_iemgui *)x);} ! static void my_numbox_lin(t_my_numbox *x) {x->x_gui.x_lin0_log1 = 0;} ! static void my_numbox_log(t_my_numbox *x) {x->x_gui.x_lin0_log1 = 1; if(my_numbox_check_minmax(x)) iemgui_dodraw((t_iemgui *)x);} --- 109,114 ---- if(my_numbox_check_minmax(x)) iemgui_dodraw((t_iemgui *)x);} ! static void my_numbox_lin(t_my_numbox *x) {x->x_is_log=0;} ! static void my_numbox_log(t_my_numbox *x) {x->x_is_log=1; if(my_numbox_check_minmax(x)) iemgui_dodraw((t_iemgui *)x);} *************** *** 126,136 **** { t_iemgui *y = (t_iemgui *)x; ! int lilo=0, w; binbuf_update(y,gensym("nbx"),argc,argv); if(!pd_scanargs(argc,argv,"iiddbiaaaiiiicccd;i", ! &y->x_w,&y->x_h,&x->x_min,&x->x_max,&lilo,&y->x_isa,&y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol,&x->x_val,&x->x_log_height)) return; - y->x_lin0_log1 = lilo; if (!y->x_isa&1) x->x_val=0.0; w=y->x_w; --- 126,135 ---- { t_iemgui *y = (t_iemgui *)x; ! int w; binbuf_update(y,gensym("nbx"),argc,argv); if(!pd_scanargs(argc,argv,"iiddbiaaaiiiicccd;i", ! &y->x_w,&y->x_h,&x->x_min,&x->x_max,&x->x_is_log,&y->x_isa,&y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol,&x->x_val,&x->x_log_height)) return; if (!y->x_isa&1) x->x_val=0.0; w=y->x_w; *************** *** 149,152 **** --- 148,152 ---- t_my_numbox *x = (t_my_numbox *)y; x->x_log_height = 256; + x->x_is_log = 0; y->x_w=5; y->x_h=14; 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.34 retrieving revision 1.1.1.4.2.4.2.35 diff -C2 -d -r1.1.1.4.2.4.2.34 -r1.1.1.4.2.4.2.35 *** g_all_guis.c 12 May 2004 09:58:11 -0000 1.1.1.4.2.4.2.34 --- g_all_guis.c 12 May 2004 10:06:58 -0000 1.1.1.4.2.4.2.35 *************** *** 351,355 **** x->x_fontsize = 8; x->x_put_in2out = 1; - x->x_lin0_log1 = 0; x->x_snd = 0; x->x_rcv = 0; --- 351,354 ---- *************** *** 358,362 **** x->x_fcol = 0x000000; x->x_lcol = 0x000000; - x->x_lin0_log1 = 0; return x; } --- 357,360 ----

1 0

pd/src u_object.tk,1.1.2.42,1.1.2.43
by Mathieu Bouchard 12 May '04

12 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17789 Modified Files: Tag: impd_0_37 u_object.tk Log Message: ditto Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.42 retrieving revision 1.1.2.43 diff -C2 -d -r1.1.2.42 -r1.1.2.43 *** u_object.tk 12 May 2004 09:58:12 -0000 1.1.2.42 --- u_object.tk 12 May 2004 10:00:27 -0000 1.1.2.43 *************** *** 511,517 **** foreach {x1 y1} [object_xy $self $canvas] {} } ! proc comment_select {self canvas flag} { ! canvas_select_object $canvas $self $flag ! } proc comment_erase {self canvas} {} --- 511,515 ---- foreach {x1 y1} [object_xy $self $canvas] {} } ! proc comment_erase {self canvas} {} *************** *** 593,600 **** } - proc radio_select {self canvas v} { - bluebox_select $self $canvas $v - } - proc radio_erase {self canvas} { bluebox_erase $self $canvas --- 591,594 ---- *************** *** 688,695 **** } - proc slider_select {self canvas v} { - bluebox_select $self $canvas $v - } - proc slider_erase {self canvas} { bluebox_erase $self $canvas --- 682,685 ---- *************** *** 756,760 **** } - proc label_select {self canvas} {} proc label_erase {self canvas} { $canvas delete ${self}LABEL --- 746,749 ---- *************** *** 786,793 **** } - proc bang_select {self canvas v} { - bluebox_select $self $canvas $v - } - proc bang_erase {self canvas} { bluebox_erase $self $canvas --- 775,778 ---- *************** *** 846,852 **** } - proc toggle_select {self canvas v} { - bluebox_select $self $canvas $v - } proc toggle_erase {self canvas} { --- 831,834 ---- *************** *** 950,957 **** } - proc vu_select {self canvas v} { - bluebox_select $self $canvas $v - } - proc vu_erase {self canvas} { bluebox_erase $self $canvas --- 932,935 ---- *************** *** 986,993 **** } - proc dropper_select {self canvas v} { - bluebox_select $self $canvas $v - } - proc dropper_erase {self canvas} { bluebox_erase $self $canvas --- 964,967 ---- *************** *** 1011,1018 **** } - proc cnv_select {self canvas v} { - bluebox_select $self $canvas $v - } - proc cnv_erase {self canvas} { label_erase $self $canvas --- 985,988 ----

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2004