Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17824
Modified Files: Tag: devel_0_39 d_soundfile.c g_canvas.h g_editor.c g_graph.c g_text.c s_main.c Log Message: miller's 0.39-1test1
Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.5.4.2.2.5 retrieving revision 1.5.4.2.2.6 diff -C2 -d -r1.5.4.2.2.5 -r1.5.4.2.2.6 *** g_text.c 21 Aug 2005 11:28:24 -0000 1.5.4.2.2.5 --- g_text.c 17 Sep 2005 22:35:07 -0000 1.5.4.2.2.6 *************** *** 62,67 **** glist_noselect(gl); glist_getnextxy(gl, &xpix, &ypix); ! x->te_xpix = glist_pixelstox(gl, xpix-3); ! x->te_ypix = glist_pixelstoy(gl, ypix-3); binbuf_restore(x->te_binbuf, 1, &at); glist_add(gl, &x->te_g); --- 62,67 ---- glist_noselect(gl); glist_getnextxy(gl, &xpix, &ypix); ! x->te_xpix = xpix-1; ! x->te_ypix = ypix-1; binbuf_restore(x->te_binbuf, 1, &at); glist_add(gl, &x->te_g);
Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.6 retrieving revision 1.7.4.17.2.7 diff -C2 -d -r1.7.4.17.2.6 -r1.7.4.17.2.7 *** s_main.c 21 Aug 2005 11:28:24 -0000 1.7.4.17.2.6 --- s_main.c 17 Sep 2005 22:35:07 -0000 1.7.4.17.2.7 *************** *** 8,12 **** */
! char pd_version[] = "Pd version 0.39 TEST 5 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 8,12 ---- */
! char pd_version[] = "Pd version 0.39-1test1 devel\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__;
Index: g_canvas.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v retrieving revision 1.3.4.3.2.8 retrieving revision 1.3.4.3.2.9 diff -C2 -d -r1.3.4.3.2.8 -r1.3.4.3.2.9 *** g_canvas.h 16 Sep 2005 19:20:04 -0000 1.3.4.3.2.8 --- g_canvas.h 17 Sep 2005 22:35:07 -0000 1.3.4.3.2.9 *************** *** 610,614 **** EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); ! EXTERN void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv);
--- 610,614 ---- EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); ! EXTERN void template_notify(t_template *tmpl, t_symbol *s, int argc, t_atom *argv);
*************** *** 621,627 **** EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); ! EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *, t_word *wp, int loud); ! EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *, t_word *wp, float pix, int loud); EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); --- 621,627 ---- EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); ! EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *tmpl, t_word *wp, int loud); ! EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *tmpl, t_word *wp, float pix, int loud); EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val);
Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.3.4.2.2.3 retrieving revision 1.3.4.2.2.4 diff -C2 -d -r1.3.4.2.2.3 -r1.3.4.2.2.4 *** g_graph.c 12 Jul 2005 15:11:07 -0000 1.3.4.2.2.3 --- g_graph.c 17 Sep 2005 22:35:07 -0000 1.3.4.2.2.4 *************** *** 612,616 **** return (x->te_xpix); else if (glist->gl_goprect) ! return (glist->gl_obj.te_xpix + x->te_xpix - glist->gl_xmargin); else return (glist_xtopixels(glist, glist->gl_x1 + (glist->gl_x2 - glist->gl_x1) * --- 612,617 ---- return (x->te_xpix); else if (glist->gl_goprect) ! return (glist_xtopixels(glist, glist->gl_x1) + ! x->te_xpix - glist->gl_xmargin); else return (glist_xtopixels(glist, glist->gl_x1 + (glist->gl_x2 - glist->gl_x1) * *************** *** 623,627 **** return (x->te_ypix); else if (glist->gl_goprect) ! return (glist->gl_obj.te_ypix + x->te_ypix - glist->gl_ymargin); else return (glist_ytopixels(glist, glist->gl_y1 + (glist->gl_y2 - glist->gl_y1) * --- 624,629 ---- return (x->te_ypix); else if (glist->gl_goprect) ! return (glist_ytopixels(glist, glist->gl_y1) + ! x->te_ypix - glist->gl_ymargin); else return (glist_ytopixels(glist, glist->gl_y1 + (glist->gl_y2 - glist->gl_y1) *
Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.11.2.4 retrieving revision 1.4.4.11.2.5 diff -C2 -d -r1.4.4.11.2.4 -r1.4.4.11.2.5 *** d_soundfile.c 21 Aug 2005 11:28:24 -0000 1.4.4.11.2.4 --- d_soundfile.c 17 Sep 2005 22:35:07 -0000 1.4.4.11.2.5 *************** *** 3245,3248 **** --- 3245,3249 ---- "writesf~: usage: open [-bytes [234]] [-wave,-nextstep,-aiff] ..."); post("... [-big,-little] [-rate ####] filename"); + return; } if (normalize || onset || (nframes != 0x7fffffff))
Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.4.4.2.2.5 retrieving revision 1.4.4.2.2.6 diff -C2 -d -r1.4.4.2.2.5 -r1.4.4.2.2.6 *** g_editor.c 22 Aug 2005 16:28:26 -0000 1.4.4.2.2.5 --- g_editor.c 17 Sep 2005 22:35:07 -0000 1.4.4.2.2.6 *************** *** 77,81 **** m = x1, x1 = x2, x2 = m; if (y1 > y2) ! m = y1, y1 = y2, x2 = m; gobj_getrect(x, glist, &gx1, &gy1, &gx2, &gy2); if (gx1 < x1 || gx1 > x2 || gx2 < x1 || gx2 > x2 || --- 77,81 ---- m = x1, x1 = x2, x2 = m; if (y1 > y2) ! m = y1, y1 = y2, y2 = m; gobj_getrect(x, glist, &gx1, &gy1, &gx2, &gy2); if (gx1 < x1 || gx1 > x2 || gx2 < x1 || gx2 > x2 ||