From 46f38b8d427735b339a98994b0db776b874f05ad Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Thu, 15 Sep 2005 03:17:27 +0000 Subject: Bug fixes for 0.39-0, in preparation for releasing 0.39-1. svn path=/trunk/; revision=3561 --- pd/src/d_soundfile.c | 1 + pd/src/g_canvas.h | 6 +++--- pd/src/g_editor.c | 2 +- pd/src/g_graph.c | 6 ++++-- pd/src/g_text.c | 10 +++++----- pd/src/makefile | 2 +- pd/src/makefile.nt | 11 ++++++++++- pd/src/s_main.c | 2 +- 8 files changed, 26 insertions(+), 14 deletions(-) (limited to 'pd/src') diff --git a/pd/src/d_soundfile.c b/pd/src/d_soundfile.c index 0ec2c2af..9b51c10f 100644 --- a/pd/src/d_soundfile.c +++ b/pd/src/d_soundfile.c @@ -2295,6 +2295,7 @@ static void writesf_open(t_writesf *x, t_symbol *s, int argc, t_atom *argv) pd_error(x, "writesf~: usage: open [-bytes [234]] [-wave,-nextstep,-aiff] ..."); post("... [-big,-little] [-rate ####] filename"); + return; } if (normalize || onset || (nframes != 0x7fffffff)) pd_error(x, "normalize/onset/nframes argument to writesf~: ignored"); diff --git a/pd/src/g_canvas.h b/pd/src/g_canvas.h index c8fb9979..0b24d432 100644 --- a/pd/src/g_canvas.h +++ b/pd/src/g_canvas.h @@ -583,7 +583,7 @@ EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, EXTERN t_template *gtemplate_get(t_gtemplate *x); EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); -EXTERN void template_notify(t_template *template, +EXTERN void template_notify(t_template *tmpl, t_symbol *s, int argc, t_atom *argv); EXTERN t_float template_getfloat(t_template *x, t_symbol *fieldname, @@ -594,9 +594,9 @@ EXTERN t_symbol *template_getsymbol(t_template *x, t_symbol *fieldname, t_word *wp, int loud); 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, +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 *template, +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); EXTERN float fielddesc_cvtfromcoord(t_fielddesc *f, float coord); diff --git a/pd/src/g_editor.c b/pd/src/g_editor.c index c621d299..51372da9 100644 --- a/pd/src/g_editor.c +++ b/pd/src/g_editor.c @@ -75,7 +75,7 @@ void gobj_vis(t_gobj *x, struct _glist *glist, int flag) if (x1 > x2) m = x1, x1 = x2, x2 = m; if (y1 > y2) - m = y1, y1 = y2, x2 = m; + m = y1, y1 = y2, y2 = m; gobj_getrect(x, glist, &gx1, &gy1, &gx2, &gy2); if (gx1 < x1 || gx1 > x2 || gx2 < x1 || gx2 > x2 || gy1 < y1 || gy1 > y2 || gy2 < y1 || gy2 > y2) diff --git a/pd/src/g_graph.c b/pd/src/g_graph.c index b7b3da72..305da6aa 100644 --- a/pd/src/g_graph.c +++ b/pd/src/g_graph.c @@ -610,7 +610,8 @@ int text_xpix(t_text *x, t_glist *glist) if (glist->gl_havewindow || !glist->gl_isgraph) return (x->te_xpix); else if (glist->gl_goprect) - return (glist->gl_obj.te_xpix + x->te_xpix - glist->gl_xmargin); + 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) * x->te_xpix / (glist->gl_screenx2 - glist->gl_screenx1))); @@ -621,7 +622,8 @@ int text_ypix(t_text *x, t_glist *glist) if (glist->gl_havewindow || !glist->gl_isgraph) return (x->te_ypix); else if (glist->gl_goprect) - return (glist->gl_obj.te_ypix + x->te_ypix - glist->gl_ymargin); + 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) * x->te_ypix / (glist->gl_screeny2 - glist->gl_screeny1))); diff --git a/pd/src/g_text.c b/pd/src/g_text.c index ed37ca40..06237319 100644 --- a/pd/src/g_text.c +++ b/pd/src/g_text.c @@ -61,8 +61,8 @@ void glist_text(t_glist *gl, t_symbol *s, int argc, t_atom *argv) SETSYMBOL(&at, gensym("comment")); glist_noselect(gl); glist_getnextxy(gl, &xpix, &ypix); - x->te_xpix = glist_pixelstox(gl, xpix-3); - x->te_ypix = glist_pixelstoy(gl, ypix-3); + x->te_xpix = xpix-1; + x->te_ypix = ypix-1; binbuf_restore(x->te_binbuf, 1, &at); glist_add(gl, &x->te_g); glist_noselect(gl); @@ -1030,7 +1030,7 @@ static int text_click(t_gobj *z, struct _glist *glist, if (doit) pd_vmess(&x->te_pd, clicksym, "fffff", (double)xpix, (double)ypix, - (double)shift, 0, (double)alt); + (double)shift, (double)0, (double)alt); return (1); } else return (0); @@ -1039,14 +1039,14 @@ static int text_click(t_gobj *z, struct _glist *glist, { if (doit) gatom_click((t_gatom *)x, (t_floatarg)xpix, (t_floatarg)ypix, - (t_floatarg)shift, 0, (t_floatarg)alt); + (t_floatarg)shift, (t_floatarg)0, (t_floatarg)alt); return (1); } else if (x->te_type == T_MESSAGE) { if (doit) message_click((t_message *)x, (t_floatarg)xpix, (t_floatarg)ypix, - (t_floatarg)shift, 0, (t_floatarg)alt); + (t_floatarg)shift, (t_floatarg)0, (t_floatarg)alt); return (1); } else return (0); diff --git a/pd/src/makefile b/pd/src/makefile index 2ad50698..433bbb6c 100644 --- a/pd/src/makefile +++ b/pd/src/makefile @@ -19,7 +19,7 @@ GLIB = -ltk8.4 -ltcl8.4 LDFLAGS = -Wl,-export-dynamic -lasound LIB = -ldl -lpthread -lasound -OPT_CFLAGS = -g +OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD diff --git a/pd/src/makefile.nt b/pd/src/makefile.nt index 22430d3c..e696e751 100644 --- a/pd/src/makefile.nt +++ b/pd/src/makefile.nt @@ -89,7 +89,7 @@ ALLCF = $(CFLAGS) $(INCLUDE) $(INCASIO) $(INCPA) $(INCPM) /D_WINDOWS \ .c.obj: cl /c $(ALLCF) /Tc$*.c -pd: ..\bin\pd.exe +pd: ..\bin\pd.exe ..\bin\pd.com gui: ..\bin\pdtcl.dll @@ -115,6 +115,15 @@ gui: ..\bin\pdtcl.dll link $(LFLAGS) /out:..\bin\pdreceive.exe /INCREMENTAL:NO \ 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 cl /c $(ALLCF) $(PADIR)\pa_common\pa_stream.c diff --git a/pd/src/s_main.c b/pd/src/s_main.c index 79e5e153..a82d930e 100644 --- a/pd/src/s_main.c +++ b/pd/src/s_main.c @@ -2,7 +2,7 @@ * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ -char pd_version[] = "Pd version 0.39 TEST 5\n"; +char pd_version[] = "Pd version 0.39-1test1\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; -- cgit v1.2.1