diff options
Diffstat (limited to 'pd/src')
-rw-r--r-- | pd/src/configure.in | 2 | ||||
-rw-r--r-- | pd/src/d_filter.c | 8 | ||||
-rw-r--r-- | pd/src/d_osc.c | 40 | ||||
-rw-r--r-- | pd/src/d_soundfile.c | 19 | ||||
-rw-r--r-- | pd/src/g_template.c | 27 | ||||
-rw-r--r-- | pd/src/g_traversal.c | 82 | ||||
-rw-r--r-- | pd/src/makefile | 2 | ||||
-rw-r--r-- | pd/src/makefile.dependencies | 537 | ||||
-rw-r--r-- | pd/src/notes.txt | 32 | ||||
-rw-r--r-- | pd/src/s_file.c | 17 | ||||
-rw-r--r-- | pd/src/s_inter.c | 32 | ||||
-rw-r--r-- | pd/src/s_main.c | 2 | ||||
-rw-r--r-- | pd/src/t_tkcmd.c | 105 | ||||
-rw-r--r-- | pd/src/u_main.tk | 20 | ||||
-rw-r--r-- | pd/src/x_list.c | 2 |
15 files changed, 493 insertions, 434 deletions
diff --git a/pd/src/configure.in b/pd/src/configure.in index 70b83ba5..fc3c56a4 100644 --- a/pd/src/configure.in +++ b/pd/src/configure.in @@ -33,7 +33,7 @@ AC_ARG_ENABLE(portaudio,[ --enable-portaudio portaudio], AC_ARG_ENABLE(portmidi, [ --enable-portmidi portmidi], portmidi=$enableval) AC_ARG_ENABLE(debug, [ --enable-debug debugging support], - USE_DEBUG_CFLAGS="no") + USE_DEBUG_CFLAGS=$enableval) AC_ARG_ENABLE(static, [ --enable-static link statically], static=$enableval) AC_ARG_ENABLE(setuid, [ --enable-setuid install as setuid (linux)], diff --git a/pd/src/d_filter.c b/pd/src/d_filter.c index 39cc9f6f..93aeac4c 100644 --- a/pd/src/d_filter.c +++ b/pd/src/d_filter.c @@ -512,9 +512,11 @@ static void sigsamphold_dsp(t_sigsamphold *x, t_signal **sp) x, sp[0]->s_n); } -static void sigsamphold_reset(t_sigsamphold *x) +static void sigsamphold_reset(t_sigsamphold *x, t_symbol *s, int argc, + t_atom *argv) { - x->x_lastin = 1e20; + x->x_lastin = ((argc > 0 && (argv[0].a_type == A_FLOAT)) ? + argv[0].a_w.w_float : 1e20); } static void sigsamphold_set(t_sigsamphold *x, t_float f) @@ -530,7 +532,7 @@ void sigsamphold_setup(void) class_addmethod(sigsamphold_class, (t_method)sigsamphold_set, gensym("set"), A_DEFFLOAT, 0); class_addmethod(sigsamphold_class, (t_method)sigsamphold_reset, - gensym("reset"), 0); + gensym("reset"), A_GIMME, 0); class_addmethod(sigsamphold_class, (t_method)sigsamphold_dsp, gensym("dsp"), 0); } diff --git a/pd/src/d_osc.c b/pd/src/d_osc.c index 37821564..0d485513 100644 --- a/pd/src/d_osc.c +++ b/pd/src/d_osc.c @@ -17,33 +17,33 @@ #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #define int32 long /* a data type that has 32 bits */ -#else +#endif /* IRIX */ + #ifdef MSW /* little-endian; most significant byte is at highest address */ #define HIOFFSET 1 #define LOWOFFSET 0 #define int32 long -#else -#ifdef __FreeBSD__ +#endif + +#if defined(__FreeBSD__) || defined(MACOSX) #include <machine/endian.h> -#if BYTE_ORDER == LITTLE_ENDIAN -#define HIOFFSET 1 -#define LOWOFFSET 0 -#else -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#endif /* BYTE_ORDER */ -#include <sys/types.h> -#define int32 int32_t #endif -#ifdef __linux__ +#ifdef MACOSX +#define __BYTE_ORDER BYTE_ORDER +#define __LITTLE_ENDIAN LITTLE_ENDIAN +#endif + +#ifdef __linux__ #include <endian.h> +#endif +#if defined(__unix__) || defined(MACOSX) #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) #error No byte order defined #endif - + #if __BYTE_ORDER == __LITTLE_ENDIAN #define HIOFFSET 1 #define LOWOFFSET 0 @@ -51,20 +51,10 @@ #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #endif /* __BYTE_ORDER */ - #include <sys/types.h> #define int32 int32_t +#endif /* __unix__ or MACOSX*/ -#else -#ifdef MACOSX -#define HIOFFSET 0 /* word offset to find MSB */ -#define LOWOFFSET 1 /* word offset to find LSB */ -#define int32 int /* a data type that has 32 bits */ - -#endif /* MACOSX */ -#endif /* __linux__ */ -#endif /* MSW */ -#endif /* SGI */ union tabfudge { diff --git a/pd/src/d_soundfile.c b/pd/src/d_soundfile.c index 400c9de6..07e0635b 100644 --- a/pd/src/d_soundfile.c +++ b/pd/src/d_soundfile.c @@ -104,6 +104,8 @@ typedef struct _datachunk { char dc_id[4]; /* data chunk id 'SSND' */ uint32 dc_size; /* length of data chunk */ + uint32 dc_offset; /* additional offset in bytes */ + uint32 dc_block; /* block size */ } t_datachunk; typedef struct _comm @@ -133,7 +135,7 @@ typedef struct _aiff #define AIFFHDRSIZE 38 /* probably not what sizeof() gives */ -#define AIFFPLUS (AIFFHDRSIZE + 8) /* header size including first chunk hdr */ +#define AIFFPLUS (AIFFHDRSIZE + 16) /* header size including SSND chunk hdr */ #define WHDR1 sizeof(t_nextstep) #define WHDR2 (sizeof(t_wave) > WHDR1 ? sizeof (t_wave) : WHDR1) @@ -678,6 +680,7 @@ static int create_soundfile(t_canvas *canvas, const char *filename, memcpy(aiffhdr->a_samprate, dogdoo, sizeof(dogdoo)); longtmp = swap4(datasize, swap); memcpy(aiffhdr->a_samprate + sizeof(dogdoo), &longtmp, 4); + memset(aiffhdr->a_samprate + sizeof(dogdoo) + 4, 0, 8); headersize = AIFFPLUS; } else /* WAVE format */ @@ -751,7 +754,19 @@ static void soundfile_finishwrite(void *obj, char *filename, int fd, ((char *)(&((t_aiff *)0)->a_nframeshi)) - (char *)0, SEEK_SET) == 0) goto baddonewrite; - mofo = swap4(nframes, swap); + mofo = swap4(itemswritten, swap); + if (write(fd, (char *)(&mofo), 4) < 4) + goto baddonewrite; + if (lseek(fd, + ((char *)(&((t_aiff *)0)->a_chunksize)) - (char *)0, + SEEK_SET) == 0) + goto baddonewrite; + mofo = swap4(itemswritten*bytesperframe+AIFFHDRSIZE, swap); + if (write(fd, (char *)(&mofo), 4) < 4) + goto baddonewrite; + if (lseek(fd, (AIFFHDRSIZE+4), SEEK_SET) == 0) + goto baddonewrite; + mofo = swap4(itemswritten*bytesperframe, swap); if (write(fd, (char *)(&mofo), 4) < 4) goto baddonewrite; } diff --git a/pd/src/g_template.c b/pd/src/g_template.c index ede0c11c..7a788933 100644 --- a/pd/src/g_template.c +++ b/pd/src/g_template.c @@ -801,6 +801,20 @@ static void fielddesc_setfloatarg(t_fielddesc *fd, int argc, t_atom *argv) else fielddesc_setfloat_const(fd, argv->a_w.w_float); } +static void fielddesc_setsymbolarg(t_fielddesc *fd, int argc, t_atom *argv) +{ + if (argc <= 0) fielddesc_setsymbol_const(fd, &s_); + else if (argv->a_type == A_SYMBOL) + { + fd->fd_type = A_SYMBOL; + fd->fd_var = 1; + fd->fd_un.fd_varsym = argv->a_w.w_symbol; + fd->fd_v1 = fd->fd_v2 = fd->fd_screen1 = fd->fd_screen2 = + fd->fd_quantum = 0; + } + else fielddesc_setsymbol_const(fd, &s_); +} + static void fielddesc_setarrayarg(t_fielddesc *fd, int argc, t_atom *argv) { if (argc <= 0) fielddesc_setfloat_const(fd, 0); @@ -1902,8 +1916,17 @@ static void *drawnumber_new(t_symbol *classsym, t_int argc, t_atom *argv) } else break; } - if (argc) fielddesc_setfloatarg(&x->x_value, argc--, argv++); - else fielddesc_setfloat_const(&x->x_value, 0); + if (flags & DRAW_SYMBOL) + { + if (argc) fielddesc_setsymbolarg(&x->x_value, argc--, argv++); + else fielddesc_setsymbol_const(&x->x_value, &s_); + + } + else + { + if (argc) fielddesc_setfloatarg(&x->x_value, argc--, argv++); + else fielddesc_setfloat_const(&x->x_value, 0); + } if (argc) fielddesc_setfloatarg(&x->x_xloc, argc--, argv++); else fielddesc_setfloat_const(&x->x_xloc, 0); if (argc) fielddesc_setfloatarg(&x->x_yloc, argc--, argv++); diff --git a/pd/src/g_traversal.c b/pd/src/g_traversal.c index a9165b8d..c99a125c 100644 --- a/pd/src/g_traversal.c +++ b/pd/src/g_traversal.c @@ -416,9 +416,21 @@ static void get_pointer(t_get *x, t_gpointer *gp) else vec = gp->gp_un.gp_scalar->sc_vec; for (i = nitems - 1, vp = x->x_variables + i; i >= 0; i--, vp--) { - float f = template_getfloat(template, vp->gv_sym, vec, 1); - outlet_float(vp->gv_outlet, f); - /* LATER deal with other types. */ + int onset, type; + t_symbol *arraytype; + if (template_find_field(template, vp->gv_sym, &onset, &type, &arraytype)) + { + if (type == DT_FLOAT) + outlet_float(vp->gv_outlet, + *(t_float *)(((char *)vec) + onset)); + else if (type == DT_SYMBOL) + outlet_symbol(vp->gv_outlet, + *(t_symbol **)(((char *)vec) + onset)); + else pd_error(x, "get: %s.%s is not a number or symbol", + template->t_sym->s_name, vp->gv_sym->s_name); + } + else pd_error(x, "get: %s.%s: no such field", + template->t_sym->s_name, vp->gv_sym->s_name); } } @@ -441,7 +453,7 @@ static t_class *set_class; typedef struct _setvariable { t_symbol *gv_sym; - t_float gv_f; /* LATER take other types */ + union word gv_w; } t_setvariable; typedef struct _set @@ -450,6 +462,7 @@ typedef struct _set t_gpointer x_gp; t_symbol *x_templatesym; int x_nin; + int x_issymbol; t_setvariable *x_variables; } t_set; @@ -458,6 +471,14 @@ static void *set_new(t_symbol *why, int argc, t_atom *argv) t_set *x = (t_set *)pd_new(set_class); int i; t_setvariable *sp; + if (argc && (argv[0].a_type == A_SYMBOL) && + !strcmp(argv[0].a_w.w_symbol->s_name, "-symbol")) + { + x->x_issymbol = 1; + argc--; + argv++; + } + else x->x_issymbol = 0; x->x_templatesym = canvas_makebindsym(atom_getsymbolarg(0, argc, argv)); if (argc) argc--, argv++; x->x_variables @@ -468,9 +489,15 @@ static void *set_new(t_symbol *why, int argc, t_atom *argv) for (i = 0, sp = x->x_variables; i < argc; i++, sp++) { sp->gv_sym = atom_getsymbolarg(i, argc, argv); - sp->gv_f = 0; - if (i) floatinlet_new(&x->x_obj, &sp->gv_f); - /* LATER figure out type as in "get" object. */ + if (x->x_issymbol) + sp->gv_w.w_symbol = &s_; + else sp->gv_w.w_float = 0; + if (i) + { + if (x->x_issymbol) + symbolinlet_new(&x->x_obj, &sp->gv_w.w_symbol); + else floatinlet_new(&x->x_obj, &sp->gv_w.w_float); + } } } pointerinlet_new(&x->x_obj, &x->x_gp); @@ -478,7 +505,7 @@ static void *set_new(t_symbol *why, int argc, t_atom *argv) return (x); } -static void set_float(t_set *x, t_float f) +static void set_bang(t_set *x) { int nitems = x->x_nin, i; t_symbol *templatesym = x->x_templatesym; @@ -503,15 +530,16 @@ static void set_float(t_set *x, t_float f) x->x_templatesym->s_name, gpointer_gettemplatesym(gp)->s_name); return; } - if (!nitems) return; - x->x_variables[0].gv_f = f; - if (gs->gs_which == GP_ARRAY) vec = gp->gp_un.gp_w; + if (!nitems) + return; + if (gs->gs_which == GP_ARRAY) + vec = gp->gp_un.gp_w; else vec = gp->gp_un.gp_scalar->sc_vec; - for (i = 0, vp = x->x_variables; i < nitems; i++, vp++) - { - template_setfloat(template, vp->gv_sym, vec, vp->gv_f, 1); - /* LATER deal with other types ala get_pointer. */ - } + if (x->x_issymbol) + for (i = 0, vp = x->x_variables; i < nitems; i++, vp++) + template_setsymbol(template, vp->gv_sym, vec, vp->gv_w.w_symbol, 1); + else for (i = 0, vp = x->x_variables; i < nitems; i++, vp++) + template_setfloat(template, vp->gv_sym, vec, vp->gv_w.w_float, 1); if (gs->gs_which == GP_GLIST) glist_redrawitem(gs->gs_un.gs_glist, (t_gobj *)(gp->gp_un.gp_scalar)); else @@ -524,6 +552,26 @@ static void set_float(t_set *x, t_float f) } } +static void set_float(t_set *x, t_float f) +{ + if (x->x_nin && !x->x_issymbol) + { + x->x_variables[0].gv_w.w_float = f; + set_bang(x); + } + else pd_error(x, "type mismatch or no field specified"); +} + +static void set_symbol(t_set *x, t_symbol *s) +{ + if (x->x_nin && x->x_issymbol) + { + x->x_variables[0].gv_w.w_symbol = s; + set_bang(x); + } + else pd_error(x, "type mismatch or no field specified"); +} + static void set_free(t_set *x) { freebytes(x->x_variables, x->x_nin * sizeof (*x->x_variables)); @@ -535,6 +583,8 @@ static void set_setup(void) set_class = class_new(gensym("set"), (t_newmethod)set_new, (t_method)set_free, sizeof(t_set), 0, A_GIMME, 0); class_addfloat(set_class, set_float); + class_addsymbol(set_class, set_symbol); + class_addbang(set_class, set_bang); } /* ---------------------- elem ----------------------------- */ diff --git a/pd/src/makefile b/pd/src/makefile index 9a560285..74fa20c4 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 = -O6 -funroll-loops -fomit-frame-pointer +OPT_CFLAGS = -g WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD diff --git a/pd/src/makefile.dependencies b/pd/src/makefile.dependencies index 770c2ce3..e51d1f4e 100644 --- a/pd/src/makefile.dependencies +++ b/pd/src/makefile.dependencies @@ -11,10 +11,8 @@ g_canvas.o: g_canvas.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h m_imp.h s_stuff.h g_canvas.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h g_all_guis.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + m_imp.h s_stuff.h g_canvas.h /usr/include/string.h g_all_guis.h g_graph.o: g_graph.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -30,8 +28,7 @@ g_graph.o: g_graph.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h + /usr/include/string.h g_text.o: g_text.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -47,11 +44,8 @@ g_text.o: g_text.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/string.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h g_rtext.o: g_rtext.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -62,13 +56,11 @@ g_rtext.o: g_rtext.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h s_stuff.h \ - g_canvas.h t_tk.h + /usr/include/ctype.h m_pd.h s_stuff.h g_canvas.h t_tk.h g_array.o: g_array.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -79,14 +71,12 @@ g_array.o: g_array.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h g_canvas.h /usr/include/math.h \ - /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \ - /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + g_canvas.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h g_template.o: g_template.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -97,20 +87,15 @@ g_template.o: g_template.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h s_stuff.h g_canvas.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + s_stuff.h g_canvas.h g_io.o: g_io.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h g_canvas.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/stdlib.h + /usr/include/gnu/stubs.h g_scalar.o: g_scalar.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -121,12 +106,11 @@ g_scalar.o: g_scalar.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h g_canvas.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + g_canvas.h g_traversal.o: g_traversal.c /usr/include/stdlib.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h \ @@ -138,12 +122,11 @@ g_traversal.o: g_traversal.c /usr/include/stdlib.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h g_canvas.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + g_canvas.h g_guiconnect.o: g_guiconnect.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h g_canvas.h g_readwrite.o: g_readwrite.c /usr/include/stdlib.h \ @@ -160,9 +143,8 @@ g_readwrite.o: g_readwrite.c /usr/include/stdlib.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h g_canvas.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + g_canvas.h /usr/include/string.h g_editor.o: g_editor.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -176,10 +158,8 @@ g_editor.o: g_editor.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h m_pd.h m_imp.h s_stuff.h g_canvas.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h m_pd.h \ + m_imp.h s_stuff.h g_canvas.h /usr/include/string.h g_all_guis.o: g_all_guis.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -190,17 +170,15 @@ g_all_guis.o: g_all_guis.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_bang.o: g_bang.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -211,17 +189,15 @@ g_bang.o: g_bang.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_hdial.o: g_hdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -232,17 +208,15 @@ g_hdial.o: g_hdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_hslider.o: g_hslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -253,17 +227,15 @@ g_hslider.o: g_hslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_mycanvas.o: g_mycanvas.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -274,17 +246,15 @@ g_mycanvas.o: g_mycanvas.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_numbox.o: g_numbox.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -295,17 +265,15 @@ g_numbox.o: g_numbox.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_toggle.o: g_toggle.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -316,17 +284,15 @@ g_toggle.o: g_toggle.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_vdial.o: g_vdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -337,15 +303,13 @@ g_vdial.o: g_vdial.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h g_vslider.o: g_vslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -356,17 +320,15 @@ g_vslider.o: g_vslider.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h g_vumeter.o: g_vumeter.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -377,17 +339,15 @@ g_vumeter.o: g_vumeter.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h \ - g_all_guis.h /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/ctype.h m_pd.h g_canvas.h t_tk.h g_all_guis.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h m_pd.o: m_pd.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -412,8 +372,7 @@ m_class.o: m_class.c m_pd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h + /usr/include/string.h m_obj.o: m_obj.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_imp.h m_atom.o: m_atom.c m_pd.h \ @@ -425,9 +384,7 @@ m_atom.o: m_atom.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h + /usr/include/string.h m_memory.o: m_memory.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -438,7 +395,7 @@ m_memory.o: m_memory.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h m_pd.h m_imp.h + m_pd.h m_imp.h m_binbuf.o: m_binbuf.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -453,11 +410,9 @@ m_binbuf.o: m_binbuf.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/string.h m_conf.o: m_conf.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_glob.o: m_glob.c m_pd.h \ @@ -490,14 +445,12 @@ s_main.o: s_main.c m_pd.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/stdlib.h /usr/include/stdio.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/alloca.h /usr/include/unistd.h \ + /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/stdlib.h \ + /usr/include/alloca.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h s_inter.o: s_inter.c m_pd.h \ @@ -534,34 +487,31 @@ s_inter.o: s_inter.c m_pd.h \ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ - /usr/include/wchar.h /usr/include/gconv.h /usr/include/bits/stdio_lim.h \ - /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \ - /usr/include/sched.h + /usr/include/asm/errno.h /usr/include/string.h /usr/include/stdio.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/gconv.h /usr/include/bits/stdio_lim.h \ + /usr/include/bits/sys_errlist.h /usr/include/sched.h s_file.o: s_file.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/bits/time.h \ - /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/gnu/stubs.h /usr/include/stdlib.h /usr/include/sys/types.h \ + /usr/include/bits/types.h /usr/include/bits/wordsize.h \ + /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \ + /usr/include/bits/endian.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ + /usr/include/alloca.h /usr/include/stdio.h /usr/include/libio.h \ + /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ + /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/sys/stat.h \ - /usr/include/bits/stat.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/asm/errno.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h s_print.o: s_print.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -577,9 +527,7 @@ s_print.o: s_print.c m_pd.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/string.h /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h s_stuff.h s_loader.o: s_loader.c /usr/include/dlfcn.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ @@ -593,13 +541,11 @@ s_loader.o: s_loader.c /usr/include/dlfcn.h /usr/include/features.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h m_pd.h s_stuff.h /usr/include/stdio.h \ - /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/getopt.h /usr/include/string.h m_pd.h s_stuff.h \ + /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ + /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h s_path.o: s_path.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -612,14 +558,12 @@ s_path.o: s_path.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ /usr/include/getopt.h /usr/include/sys/stat.h /usr/include/bits/stat.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h m_pd.h m_imp.h s_stuff.h \ - /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ - /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/string.h m_pd.h m_imp.h s_stuff.h /usr/include/stdio.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/ctype.h + /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/ctype.h s_entry.o: s_entry.c s_audio.o: s_audio.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ @@ -630,17 +574,16 @@ s_audio.o: s_audio.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/sys/time.h /usr/include/time.h \ - /usr/include/bits/time.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/sys/resource.h /usr/include/bits/resource.h \ - /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/sys/resource.h \ + /usr/include/bits/resource.h /usr/include/stdlib.h \ + /usr/include/sys/types.h /usr/include/endian.h \ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/errno.h \ + /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h \ /usr/include/bits/errno.h /usr/include/linux/errno.h \ /usr/include/asm/errno.h s_midi.o: s_midi.c m_pd.h \ @@ -652,19 +595,16 @@ s_midi.o: s_midi.c m_pd.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ - /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ - /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ + /usr/include/bits/sigset.h /usr/include/string.h /usr/include/stdio.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/signal.h \ - /usr/include/bits/signum.h /usr/include/bits/siginfo.h \ - /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ - /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/bits/sigthread.h + /usr/include/signal.h /usr/include/bits/signum.h \ + /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \ + /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \ + /usr/include/bits/sigstack.h /usr/include/bits/pthreadtypes.h \ + /usr/include/bits/sched.h /usr/include/bits/sigthread.h d_ugen.o: d_ugen.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h m_imp.h \ /usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -681,8 +621,7 @@ d_ctl.o: d_ctl.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h d_arithmetic.o: d_arithmetic.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h d_osc.o: d_osc.c m_pd.h \ @@ -690,20 +629,18 @@ d_osc.o: d_osc.c m_pd.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/types.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/time.h \ - /usr/include/sys/select.h /usr/include/bits/select.h \ - /usr/include/bits/sigset.h /usr/include/bits/time.h \ - /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ - /usr/include/bits/sched.h + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/types.h /usr/include/bits/types.h \ + /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ + /usr/include/time.h /usr/include/sys/select.h \ + /usr/include/bits/select.h /usr/include/bits/sigset.h \ + /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ + /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h d_filter.o: d_filter.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h d_dac.o: d_dac.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h d_misc.o: d_misc.c m_pd.h \ @@ -715,15 +652,12 @@ d_misc.o: d_misc.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h + /usr/include/string.h d_math.o: d_math.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h d_fft.o: d_fft.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h d_mayer_fft.o: d_mayer_fft.c m_pd.h \ @@ -738,9 +672,8 @@ d_fftroutine.o: d_fftroutine.c /usr/include/stdio.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/math.h \ - /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \ - /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \ + /usr/include/math.h /usr/include/bits/huge_val.h \ + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ @@ -760,11 +693,7 @@ d_array.o: d_array.c m_pd.h \ d_global.o: d_global.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/stdlib.h + /usr/include/gnu/stubs.h d_delay.o: d_delay.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h d_resample.o: d_resample.c m_pd.h \ @@ -773,21 +702,16 @@ x_arithmetic.o: x_arithmetic.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h x_connective.o: x_connective.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/bits/types.h \ + /usr/include/gnu/stubs.h /usr/include/stdio.h /usr/include/bits/types.h \ /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/stdlib.h /usr/include/stdio.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h x_interface.o: x_interface.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h x_midi.o: x_midi.c m_pd.h \ @@ -797,22 +721,19 @@ x_misc.o: x_misc.c m_pd.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h /usr/include/stdio.h \ - /usr/include/bits/types.h /usr/include/bits/wordsize.h \ - /usr/include/bits/typesizes.h /usr/include/libio.h \ - /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \ - /usr/include/gconv.h \ + /usr/include/stdio.h /usr/include/bits/types.h \ + /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ + /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ + /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/sys/time.h /usr/include/sys/times.h \ - /usr/include/sys/param.h \ + /usr/include/string.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/bits/sched.h /usr/include/sys/time.h \ + /usr/include/sys/times.h /usr/include/sys/param.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ /usr/include/limits.h /usr/include/bits/posix1_lim.h \ @@ -829,14 +750,12 @@ x_time.o: x_time.c m_pd.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h x_acoustics.o: x_acoustics.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/math.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/huge_val.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /usr/include/bits/mathinline.h + /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h x_net.o: x_net.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h s_stuff.h \ /usr/include/sys/types.h /usr/include/features.h \ @@ -847,9 +766,7 @@ x_net.o: x_net.c m_pd.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/stdlib.h \ - /usr/include/sys/socket.h /usr/include/sys/uio.h \ + /usr/include/string.h /usr/include/sys/socket.h /usr/include/sys/uio.h \ /usr/include/bits/uio.h /usr/include/bits/socket.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/limits.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.h \ @@ -864,18 +781,14 @@ x_net.o: x_net.c m_pd.h \ /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h \ /usr/include/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ - /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h + /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h x_qlist.o: x_qlist.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/bits/types.h \ + /usr/include/gnu/stubs.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/types.h \ /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/stdlib.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h + /usr/include/bits/confname.h /usr/include/getopt.h x_gui.o: x_gui.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ @@ -885,19 +798,13 @@ x_gui.o: x_gui.c m_pd.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/endian.h /usr/include/bits/endian.h /usr/include/stdlib.h \ - /usr/include/unistd.h /usr/include/bits/posix_opt.h \ - /usr/include/bits/confname.h /usr/include/getopt.h + /usr/include/string.h /usr/include/unistd.h \ + /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ + /usr/include/getopt.h x_list.o: x_list.c m_pd.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ - /usr/include/string.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/bits/types.h \ - /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \ - /usr/include/stdlib.h + /usr/include/alloca.h /usr/include/features.h /usr/include/sys/cdefs.h \ + /usr/include/gnu/stubs.h d_soundfile.o: d_soundfile.c /usr/include/unistd.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/posix_opt.h \ @@ -916,9 +823,7 @@ d_soundfile.o: d_soundfile.c /usr/include/unistd.h \ /usr/include/wchar.h /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ - /usr/include/stdlib.h /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/string.h /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h m_pd.h s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ @@ -929,10 +834,10 @@ s_midi_oss.o: s_midi_oss.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ - /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ @@ -952,15 +857,14 @@ s_audio_oss.o: s_audio_oss.c /usr/include/linux/soundcard.h \ /usr/include/bits/wchar.h /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ - /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/sys/time.h /usr/include/sys/stat.h \ /usr/include/bits/stat.h /usr/include/sys/ioctl.h \ /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ @@ -978,33 +882,31 @@ s_audio_alsa.o: s_audio_alsa.c /usr/include/alsa/asoundlib.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \ - /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ - /usr/include/alsa/global.h /usr/include/alsa/input.h \ - /usr/include/alsa/output.h /usr/include/alsa/error.h \ - /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \ - /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \ - /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \ - /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \ - /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \ - /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \ - /usr/include/alsa/instr.h m_pd.h s_stuff.h /usr/include/sys/time.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h \ - /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \ - /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \ - /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \ - /usr/include/sched.h /usr/include/sys/mman.h /usr/include/bits/mman.h \ - s_audio_alsa.h + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \ + /usr/include/sys/poll.h /usr/include/bits/poll.h /usr/include/errno.h \ + /usr/include/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/asm/errno.h /usr/include/alsa/asoundef.h \ + /usr/include/alsa/version.h /usr/include/alsa/global.h \ + /usr/include/alsa/input.h /usr/include/alsa/output.h \ + /usr/include/alsa/error.h /usr/include/alsa/conf.h \ + /usr/include/alsa/pcm.h /usr/include/alsa/rawmidi.h \ + /usr/include/alsa/timer.h /usr/include/alsa/hwdep.h \ + /usr/include/alsa/control.h /usr/include/alsa/mixer.h \ + /usr/include/alsa/seq_event.h /usr/include/alsa/seq.h \ + /usr/include/alsa/seqmid.h /usr/include/alsa/seq_midi_event.h \ + /usr/include/alsa/conv.h /usr/include/alsa/instr.h m_pd.h s_stuff.h \ + /usr/include/sys/time.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/sys/ioctl.h \ + /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ + /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ + /usr/include/sys/ttydefaults.h /usr/include/sched.h \ + /usr/include/sys/mman.h /usr/include/bits/mman.h s_audio_alsa.h s_audio_alsamm.o: s_audio_alsamm.c /usr/include/alsa/asoundlib.h \ /usr/include/unistd.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/gnu/stubs.h /usr/include/bits/posix_opt.h \ @@ -1016,32 +918,30 @@ s_audio_alsamm.o: s_audio_alsamm.c /usr/include/alsa/asoundlib.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/stdlib.h \ - /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \ - /usr/include/bits/endian.h /usr/include/sys/select.h \ - /usr/include/bits/select.h /usr/include/bits/sigset.h \ - /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \ - /usr/include/alloca.h /usr/include/string.h /usr/include/bits/string.h \ - /usr/include/bits/string2.h /usr/include/fcntl.h \ - /usr/include/bits/fcntl.h /usr/include/assert.h /usr/include/sys/poll.h \ - /usr/include/bits/poll.h /usr/include/errno.h /usr/include/bits/errno.h \ - /usr/include/linux/errno.h /usr/include/asm/errno.h \ - /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ - /usr/include/alsa/global.h /usr/include/alsa/input.h \ - /usr/include/alsa/output.h /usr/include/alsa/error.h \ - /usr/include/alsa/conf.h /usr/include/alsa/pcm.h \ - /usr/include/alsa/rawmidi.h /usr/include/alsa/timer.h \ - /usr/include/alsa/hwdep.h /usr/include/alsa/control.h \ - /usr/include/alsa/mixer.h /usr/include/alsa/seq_event.h \ - /usr/include/alsa/seq.h /usr/include/alsa/seqmid.h \ - /usr/include/alsa/seq_midi_event.h /usr/include/alsa/conv.h \ - /usr/include/alsa/instr.h m_pd.h s_stuff.h /usr/include/sys/time.h \ - /usr/include/sys/stat.h /usr/include/bits/stat.h \ - /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \ - /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \ - /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \ - /usr/include/sched.h s_audio_alsa.h + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/sys/select.h /usr/include/bits/select.h \ + /usr/include/bits/sigset.h /usr/include/bits/time.h \ + /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ + /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/string.h \ + /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/assert.h \ + /usr/include/sys/poll.h /usr/include/bits/poll.h /usr/include/errno.h \ + /usr/include/bits/errno.h /usr/include/linux/errno.h \ + /usr/include/asm/errno.h /usr/include/alsa/asoundef.h \ + /usr/include/alsa/version.h /usr/include/alsa/global.h \ + /usr/include/alsa/input.h /usr/include/alsa/output.h \ + /usr/include/alsa/error.h /usr/include/alsa/conf.h \ + /usr/include/alsa/pcm.h /usr/include/alsa/rawmidi.h \ + /usr/include/alsa/timer.h /usr/include/alsa/hwdep.h \ + /usr/include/alsa/control.h /usr/include/alsa/mixer.h \ + /usr/include/alsa/seq_event.h /usr/include/alsa/seq.h \ + /usr/include/alsa/seqmid.h /usr/include/alsa/seq_midi_event.h \ + /usr/include/alsa/conv.h /usr/include/alsa/instr.h m_pd.h s_stuff.h \ + /usr/include/sys/time.h /usr/include/sys/stat.h \ + /usr/include/bits/stat.h /usr/include/sys/ioctl.h \ + /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ + /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ + /usr/include/sys/ttydefaults.h /usr/include/sched.h s_audio_alsa.h s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stddef.h \ @@ -1051,10 +951,10 @@ s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/gconv.h \ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/bits/stdio.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \ - /usr/include/getopt.h /usr/include/stdlib.h /usr/include/sys/types.h \ - /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/confname.h /usr/include/getopt.h \ + /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ + /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/bits/time.h \ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \ @@ -1063,7 +963,6 @@ s_midi_alsa.o: s_midi_alsa.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/errno.h /usr/include/bits/errno.h \ /usr/include/linux/errno.h /usr/include/asm/errno.h \ /usr/include/alsa/asoundlib.h /usr/include/string.h \ - /usr/include/bits/string.h /usr/include/bits/string2.h \ /usr/include/assert.h /usr/include/sys/poll.h /usr/include/bits/poll.h \ /usr/include/alsa/asoundef.h /usr/include/alsa/version.h \ /usr/include/alsa/global.h /usr/include/alsa/input.h \ diff --git a/pd/src/notes.txt b/pd/src/notes.txt index 8fa53b39..c3fddbc1 100644 --- a/pd/src/notes.txt +++ b/pd/src/notes.txt @@ -12,29 +12,28 @@ plot drawing instructions turn on and off ranges in drawing instructions unify graph properties dialogs GOP font depends on abstraction, not parent - +bug fixes, stale pointers +message "addcomma" etc +"list" object +Mac to tcl/tk 8.4.5; pd extension added automatically +bug fix writing aiff gfiles +bug fix (tcl error messages when starting open dialogs) ------------ 0.39 --------- problems: windows: modal dialogs confuse watchdog + check the right-click-on-empty-canvas mac: - .pd extension not added when saving? -TK commands to nonexistent windows? (maybe fixed) -array name changes don't show up on parent -arrays that don't fit in bounds don't update (same as red rectangle problem?) -what about upsampling inlet~s? ask Pd list... - - -flag for array to suppress printing name + load libraries first before opening patches on drag-and-drop check: MIDI I/O for windows blechman patch for s_inter.c +check what happens when going back and forth between graph-on-parent garray change: make a gobj_redraw that schedules the redraw -put two radio button banks side by side array_resize etc., should redraw the array directly? Or should "setsize" and "garray_resize" do it instead? check it's queued correctly. @@ -45,8 +44,13 @@ block resampling arguments document tabwrite~_start problems: +TK commands to nonexistent windows? (occasionally still happens) +array name changes don't show up on parent +arrays that don't fit in bounds don't update (same as red rectangle problem?) +look in d_resample.pd to inderstand inlet~ upsampling... +flag for array to suppress printing name +fix samplerate~ to figure out blocking patcher inlets don't deal with scalars (zbug.pd) -Macintosh .pd extension not added to filenames need to optimize canvas_motion (get rid of box hit test??) check if there's a problem loading libs on startup if superuser tk errors for large tables? @@ -60,9 +64,7 @@ qlist - 'next 1' seems not to work Krzysztof's qlist_next reentrancy bug don't draw in/outlets on gui objects in graph-on-parent reasonable font size default for GUIs -font size should depend on subpatch/abstraction moving a bang toward top of window creates problem (invisible label) -check what happens when going back and forth between graph-on-parent get rid of messages causing renaming; try to prevent patches closing themselves. dac~/ adc~/ block~ incompatibility scofo reports error on reading score1.txt @@ -72,11 +74,11 @@ check if _vsnprintf with zero argument in windows works any better... features: flag to suppress printing array name above graph -rename windowname-pd instead of pd-windowname fix copyright notices IEM guis to use queued updates pixel font sizes pd to find running ones (pd -new to defeat) +rename windowname-pd instead of pd-windowname "enter" into object box to create new one (also, changing borders? forking?) tab to jump to a connected object (first one?) (shift-tab to back up?) tables: @@ -88,10 +90,8 @@ tables: queued graphics updates for IEMGUIs and scalars think of a way to embed abstractions in a patch make watchdog work for MACOSX -IEMGUIs better default font size search path to include both calling patch and abstraction, if different abstraction reload shouldn't have to vis everyone -addcomma message to message pasting should look at current mouse location delete-in-rectangle message to Pds put serial object in main dist (see rat@telecoma, Apr. 25; winfried May 22) diff --git a/pd/src/s_file.c b/pd/src/s_file.c index bb04e797..bd8b5073 100644 --- a/pd/src/s_file.c +++ b/pd/src/s_file.c @@ -263,7 +263,7 @@ void sys_loadpreferences( void) int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV]; int nmidiindev, midiindev[MAXMIDIINDEV]; int nmidioutdev, midioutdev[MAXMIDIOUTDEV]; - int i, rate = 0, advance = 0, api, nolib; + int i, rate = 0, advance = 0, api, nolib, maxi; char prefbuf[MAXPDSTRING], keybuf[80]; sys_initloadpreferences(); /* load audio preferences */ @@ -338,8 +338,12 @@ void sys_loadpreferences( void) nmidioutdev++; } sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0); + /* search path */ - for (i = 0; 1; i++) + if (sys_getpreference("npath", prefbuf, MAXPDSTRING)) + sscanf(prefbuf, "%d", &maxi); + else maxi = 0x7fffffff; + for (i = 0; i<maxi; i++) { sprintf(keybuf, "path%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) @@ -352,7 +356,10 @@ void sys_loadpreferences( void) sscanf(prefbuf, "%d", &sys_verbose); /* startup settings */ - for (i = 0; 1; i++) + if (sys_getpreference("nloadlib", prefbuf, MAXPDSTRING)) + sscanf(prefbuf, "%d", &maxi); + else maxi = 0x7fffffff; + for (i = 0; i<maxi; i++) { sprintf(keybuf, "loadlib%d", i+1); if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING)) @@ -448,6 +455,8 @@ void glob_savepreferences(t_pd *dummy) sprintf(buf1, "path%d", i+1); sys_putpreference(buf1, pathelem); } + sprintf(buf1, "%d", i); + sys_putpreference("npath", buf1); sprintf(buf1, "%d", sys_usestdpath); sys_putpreference("standardpath", buf1); sprintf(buf1, "%d", sys_verbose); @@ -462,6 +471,8 @@ void glob_savepreferences(t_pd *dummy) sprintf(buf1, "loadlib%d", i+1); sys_putpreference(buf1, pathelem); } + sprintf(buf1, "%d", i); + sys_putpreference("nloadlib", buf1); sprintf(buf1, "%d", sys_defeatrt); sys_putpreference("defeatrt", buf1); sys_putpreference("flags", diff --git a/pd/src/s_inter.c b/pd/src/s_inter.c index 3e9ded5f..f77b5e84 100644 --- a/pd/src/s_inter.c +++ b/pd/src/s_inter.c @@ -468,6 +468,8 @@ static void socketreceiver_getudp(t_socketreceiver *x, int fd) } } +void sys_exit(void); + void socketreceiver_read(t_socketreceiver *x, int fd) { if (x->sr_udp) /* UDP ("datagram") socket protocol */ @@ -506,7 +508,8 @@ void socketreceiver_read(t_socketreceiver *x, int fd) if (x == sys_socketreceiver) { fprintf(stderr, "pd: exiting\n"); - sys_bail(0); + sys_exit(); + return; } else { @@ -1028,28 +1031,51 @@ int sys_startgui(const char *guidir) #ifdef MACOSX char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; + /* first look for Wish bundled with and renamed "Pd" */ sprintf(filename, "%s/../../MacOS/Pd", guidir); if (stat(filename, &statbuf) >= 0) goto foundit; if (!homedir || strlen(homedir) > 150) goto nohomedir; + /* Look for Wish in user's Applications. Might or might + not be names "Wish Shell", and might or might not be + in "Utilities" subdir. */ sprintf(filename, "%s/Applications/Utilities/Wish shell.app/Contents/MacOS/Wish Shell", homedir); if (stat(filename, &statbuf) >= 0) goto foundit; sprintf(filename, + "%s/Applications/Utilities/Wish.app/Contents/MacOS/Wish", + homedir); + if (stat(filename, &statbuf) >= 0) + goto foundit; + sprintf(filename, "%s/Applications/Wish shell.app/Contents/MacOS/Wish Shell", homedir); if (stat(filename, &statbuf) >= 0) goto foundit; + sprintf(filename, + "%s/Applications/Wish.app/Contents/MacOS/Wish", + homedir); + if (stat(filename, &statbuf) >= 0) + goto foundit; nohomedir: + /* Perform the same search among system applications. */ strcpy(filename, "/Applications/Utilities/Wish Shell.app/Contents/MacOS/Wish Shell"); if (stat(filename, &statbuf) >= 0) goto foundit; strcpy(filename, + "/Applications/Utilities/Wish.app/Contents/MacOS/Wish"); + if (stat(filename, &statbuf) >= 0) + goto foundit; + strcpy(filename, "/Applications/Wish Shell.app/Contents/MacOS/Wish Shell"); + if (stat(filename, &statbuf) >= 0) + goto foundit; + strcpy(filename, + "/Applications/Wish.app/Contents/MacOS/Wish"); foundit: sprintf(cmdbuf, "\"%s\" %s/pd.tk %d\n", filename, guidir, portno); #else @@ -1235,9 +1261,9 @@ void sys_bail(int n) sys_close_midi(); fprintf(stderr, "... done.\n"); #endif - exit(1); + exit(n); } - else _exit(n); + else _exit(1); } void glob_quit(void *dummy) diff --git a/pd/src/s_main.c b/pd/src/s_main.c index 1aa106d6..7b4b6aac 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 4\n"; +char pd_version[] = "Pd version 0.39 TEST 4b\n"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; diff --git a/pd/src/t_tkcmd.c b/pd/src/t_tkcmd.c index 546ffb67..31c39b52 100644 --- a/pd/src/t_tkcmd.c +++ b/pd/src/t_tkcmd.c @@ -99,18 +99,19 @@ static void pdgui_sockerror(char *s) static int sockfd; -/* The "pd_suck" command, which polls the socket. */ +/* The "pd_readsocket" command, which polls the socket. */ #define CHUNKSIZE 20000 /* chunks to allocate memory for reading socket */ #define READSIZE 10000 /* size of read to issue */ static char *pd_tkbuf = 0; /* buffer for reading */ static int pd_tkbufsize = 0; /* current buffer size */ -static int pd_tkgotbytes = 0; /* number of bytes already in buffer */ +static int pd_buftail = 0; /* number of bytes already in buffer */ +static int pd_bufhead = 0; /* index of first byte to read */ + /* mask argument unused but is here to follow tcl's prototype. */ static void pd_readsocket(ClientData cd, int mask) { - int ngot; fd_set readset, writeset, exceptset; struct timeval timout; @@ -130,7 +131,7 @@ static void pd_readsocket(ClientData cd, int mask) } pd_tkbufsize = CHUNKSIZE; } - if (pd_tkgotbytes + READSIZE + 1 > pd_tkbufsize) + if (pd_buftail + READSIZE + 1 > pd_tkbufsize) { int newsize = pd_tkbufsize + CHUNKSIZE; char *newbuf = realloc(pd_tkbuf, newsize); @@ -147,56 +148,80 @@ static void pd_readsocket(ClientData cd, int mask) if (FD_ISSET(sockfd, &exceptset) || FD_ISSET(sockfd, &readset)) { int ret; - ret = recv(sockfd, pd_tkbuf + pd_tkgotbytes, READSIZE, 0); + ret = recv(sockfd, pd_tkbuf + pd_buftail, READSIZE, 0); if (ret < 0) pdgui_sockerror("socket receive error"); else if (ret == 0) { - /* fprintf(stderr, "read %d\n", SOCKSIZE - pd_tkgotbytes); */ + /* fprintf(stderr, "read %d\n", SOCKSIZE - pd_buftail); */ fprintf(stderr, "pd_gui: pd process exited\n"); tcl_mess("exit\n"); } else { - char *lastcr = 0, *bp = pd_tkbuf, *ep = bp + (pd_tkgotbytes + ret); - int brace = 0; - char lastc = 0; - /* search for locations that terminate a complete TK - command. These are carriage returns which are not inside - any braces. Braces can be escaped with backslashes (but - backslashes themselves can't.) */ - while (bp < ep) + pd_buftail += ret; + while (1) { - char c = *bp; - if (c == '}' && brace) - brace--; - else if (c == '{') - brace++; - else if (!brace && c == '\n' && lastc != '\\') - lastcr = bp; - lastc = c; - bp++; - } - /* if lastcr is set there is at least one complete TK - command in the buffer. Execute it or them, and slide any - extra bytes to beginning of the buffer. */ - if (lastcr) - { - int xtra = pd_tkbuf + pd_tkgotbytes + ret - (lastcr+1); - char bashwas = lastcr[1]; - lastcr[1] = 0; - tcl_mess(pd_tkbuf); - lastcr[1] = bashwas; - if (xtra) + char lastc = 0, *gotcr = 0, *bp = pd_tkbuf + pd_bufhead, + *ep = pd_tkbuf + pd_buftail; + int brace = 0; + /* search for locations that terminate a complete TK + command. These are carriage returns which are not inside + any braces. Braces can be escaped with backslashes (but + backslashes themselves can't.) */ + while (bp < ep) + { + char c = *bp; + if (c == '}' && brace) + brace--; + else if (c == '{') + brace++; + else if (!brace && c == '\n' && lastc != '\\') + { + gotcr = bp; + break; + } + lastc = c; + bp++; + } + /* if gotcr is set there is at least one complete TK + command in the buffer, and gotcr terminates the first one. + Because sending the command to tcl may cause this code to + be reentered, we first copy the command and take it out of + the buffer, then execute the command. + Execute it and slide any + extra bytes to beginning of the buffer. */ + if (gotcr) { - /* fprintf(stderr, "x %d\n", xtra); */ - memmove(pd_tkbuf, lastcr+1, xtra); + int bytesincmd = (gotcr - (pd_tkbuf+pd_bufhead)) + 1; + char smallcmdbuf[1000], *realcmdbuf; + if (gotcr - (pd_tkbuf+pd_bufhead) < 998) + realcmdbuf = smallcmdbuf; + else realcmdbuf = malloc(bytesincmd+1); + if (realcmdbuf) + { + strncpy(realcmdbuf, pd_tkbuf+pd_bufhead, bytesincmd); + realcmdbuf[bytesincmd] = 0; + } + pd_bufhead += bytesincmd; + if (realcmdbuf) + { + tcl_mess(realcmdbuf); + if (realcmdbuf != smallcmdbuf) + free(realcmdbuf); + } + if (pd_buftail < pd_bufhead) + fprintf(stderr, "tkcmd bug\n"); } - pd_tkgotbytes = xtra; + else break; } - else + if (pd_bufhead) { - pd_tkgotbytes += ret; + if (pd_buftail > pd_bufhead) + memmove(pd_tkbuf, pd_tkbuf + pd_bufhead, + pd_buftail-pd_bufhead); + pd_buftail -= pd_bufhead; + pd_bufhead = 0; } } } diff --git a/pd/src/u_main.tk b/pd/src/u_main.tk index 401b37d6..26545f98 100644 --- a/pd/src/u_main.tk +++ b/pd/src/u_main.tk @@ -1426,7 +1426,8 @@ proc pdtk_canvas_checkgeometry {topname} { } proc pdtk_canvas_click {name x y b f} { -# puts stderr [concat got $f] + global pd_nt + if {$pd_nt == 0} {focus $name} pd [canvastosym $name] mouse [$name canvasx $x] [$name canvasy $y] $b $f \; } @@ -1621,11 +1622,28 @@ set saveas_dir nowhere ############ pdtk_canvas_saveas -- run a saveas dialog ############## proc pdtk_canvas_saveas {name initfile initdir} { + global pd_nt set filename [tk_getSaveFile -initialfile $initfile \ -initialdir $initdir -defaultextension .pd \ -filetypes { {{pd files} {.pd}} {{max files} {.pat}} }] if {$filename != ""} { +# yes, we need the extent even if we're on a mac. + if {$pd_nt == 2} { + if {[string last .pd $filename] < 0 && \ + [string last .PD $filename] < 0 && \ + [string last .pat $filename] < 0 && \ + [string last .PAT $filename] < 0} { + set filename $filename.pd + if {[file exists $filename]} { + set answer [tk_messageBox \ + \-message [concat overwrite $filename "?"] \ + \-type yesno \-icon question] + if {$answer == no} {return} + } + } + } + set directory [string range $filename 0 \ [expr [string last / $filename ] - 1]] set basename [string range $filename \ diff --git a/pd/src/x_list.c b/pd/src/x_list.c index a867e293..a08fe193 100644 --- a/pd/src/x_list.c +++ b/pd/src/x_list.c @@ -15,7 +15,7 @@ extern t_pd *newest; list append - append a list to another list prepend - prepend a list to another list split - first n elements to first outlet, rest to second outlet - list strip - send message with leading symbol as selector + list trim - trim off "list" selector list length - output number of items in list list nth - nth item in list, counting from zero |