Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13699/pd/src
Modified Files: d_soundfile.c g_canvas.h g_editor.c g_graph.c g_text.c makefile makefile.nt s_main.c Log Message: Bug fixes for 0.39-0, in preparation for releasing 0.39-1.
Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** g_text.c 19 Aug 2005 23:28:03 -0000 1.10 --- g_text.c 15 Sep 2005 03:17:27 -0000 1.11 *************** *** 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); *************** *** 1031,1035 **** pd_vmess(&x->te_pd, clicksym, "fffff", (double)xpix, (double)ypix, ! (double)shift, 0, (double)alt); return (1); } --- 1031,1035 ---- pd_vmess(&x->te_pd, clicksym, "fffff", (double)xpix, (double)ypix, ! (double)shift, (double)0, (double)alt); return (1); } *************** *** 1040,1044 **** if (doit) gatom_click((t_gatom *)x, (t_floatarg)xpix, (t_floatarg)ypix, ! (t_floatarg)shift, 0, (t_floatarg)alt); return (1); } --- 1040,1044 ---- if (doit) gatom_click((t_gatom *)x, (t_floatarg)xpix, (t_floatarg)ypix, ! (t_floatarg)shift, (t_floatarg)0, (t_floatarg)alt); return (1); } *************** *** 1047,1051 **** if (doit) message_click((t_message *)x, (t_floatarg)xpix, (t_floatarg)ypix, ! (t_floatarg)shift, 0, (t_floatarg)alt); return (1); } --- 1047,1051 ---- if (doit) message_click((t_message *)x, (t_floatarg)xpix, (t_floatarg)ypix, ! (t_floatarg)shift, (t_floatarg)0, (t_floatarg)alt); return (1); }
Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** s_main.c 19 Aug 2005 23:28:03 -0000 1.17 --- s_main.c 15 Sep 2005 03:17:27 -0000 1.18 *************** *** 3,7 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
! char pd_version[] = "Pd version 0.39 TEST 5\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 3,7 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
! char pd_version[] = "Pd version 0.39-1test1\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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** g_canvas.h 19 Aug 2005 23:28:03 -0000 1.11 --- g_canvas.h 15 Sep 2005 03:17:27 -0000 1.12 *************** *** 584,588 **** EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); ! EXTERN void template_notify(t_template *template, t_symbol *s, int argc, t_atom *argv);
--- 584,588 ---- 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);
*************** *** 595,601 **** 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 *template, t_word *wp, int loud); ! EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *template, t_word *wp, float pix, int loud); EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); --- 595,601 ---- 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: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.nt 24 Jul 2005 19:41:14 -0000 1.6 --- makefile.nt 15 Sep 2005 03:17:27 -0000 1.7 *************** *** 90,94 **** cl /c $(ALLCF) /Tc$*.c
! pd: ..\bin\pd.exe
gui: ..\bin\pdtcl.dll --- 90,94 ---- cl /c $(ALLCF) /Tc$*.c
! pd: ..\bin\pd.exe ..\bin\pd.com
gui: ..\bin\pdtcl.dll *************** *** 116,119 **** --- 116,128 ---- u_pdreceive.obj $(LIB)
+ s_entry_com.obj: s_entry.c + copy s_entry.c s_entry_com.c + cl /c s_entry_com.c + del s_entry_com.c + + ..\bin\pd.com: s_entry_com.obj ..\bin\pd.lib + link $(LFLAGS) /out:..\bin\pd.com /INCREMENTAL:NO s_entry_com.obj \ + ..\bin\pd.lib $(LIB) $(ASIOLIB) + # explicit rules to compile portaudio sources: pa_stream.obj: $(PADIR)\pa_common\pa_stream.c
Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile 21 Aug 2005 17:46:52 -0000 1.19 --- makefile 15 Sep 2005 03:17:27 -0000 1.20 *************** *** 20,24 **** LIB = -ldl -lpthread -lasound
! OPT_CFLAGS = -g WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch --- 20,24 ---- LIB = -ldl -lpthread -lasound
! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch
Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** g_graph.c 8 Jul 2005 00:02:44 -0000 1.8 --- g_graph.c 15 Sep 2005 03:17:27 -0000 1.9 *************** *** 611,615 **** 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) * --- 611,616 ---- 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) * *************** *** 622,626 **** 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) * --- 623,628 ---- 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.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** d_soundfile.c 19 Aug 2005 23:28:03 -0000 1.8 --- d_soundfile.c 15 Sep 2005 03:17:27 -0000 1.9 *************** *** 2296,2299 **** --- 2296,2300 ---- "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.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** g_editor.c 21 Aug 2005 14:46:17 -0000 1.12 --- g_editor.c 15 Sep 2005 03:17:27 -0000 1.13 *************** *** 76,80 **** 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 || --- 76,80 ---- 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 ||