Pd-cvs June 2005

pd-cvs@lists.iem.at

14 participants
211 discussions

packages/darwin_app Makefile, 1.14, 1.15 README, 1.4, 1.5 TODO, 1.6, 1.7
by Hans-Christoph Steiner 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6321 Modified Files: Makefile README TODO Log Message: cleaned up build system, tweaked flext build Index: README =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README 3 Jun 2005 20:28:25 -0000 1.4 --- README 9 Jun 2005 06:23:07 -0000 1.5 *************** *** 67,68 **** --- 67,69 ---- + The final build product will be put into build/Pd.app. Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 8 Jun 2005 16:50:07 -0000 1.14 --- Makefile 9 Jun 2005 06:23:06 -0000 1.15 *************** *** 2,49 **** current: darwin_app PD_APP_NAME = Pd ! ! ifndef DESTDIR ! DESTDIR = installroot ! endif ! ! PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources [...1034 lines suppressed...] ! cd flext && make -f makefile.pd-darwin clean; \ ! cd dyn && make -f makefile.pd-darwin clean; \ ! cd fftease && make -f makefile.pd-darwin clean; \ ! cd pool && make -f makefile.pd-darwin clean; \ ! cd py && make -f makefile.pd-darwin clean; \ ! cd vasp && make -f makefile.pd-darwin clean; \ ! cd vst && make -f makefile.pd-darwin clean; \ ! cd xsample && make -f makefile.pd-darwin clean; \ ! ) ! cd ../../externals/footils/syncgrain && make -f makefile.pd-darwin clean --- 564,571 ---- darwin_app_externals_flext_clean: ! cd $(EXTERNALS_SRC)/footils/syncgrain && make -f makefile.pd-darwin clean ! cd $(EXTERNALS_SRC)/grill && \ ! rm flext/buildsys/config-mac-pd-gcc.txt config.txt flext/config.txt \ ! flext/source/libflext.a */pd-darwin/*.o */pd-darwin/*.pd_darwin \ ! */pd-darwin/*/*.pd_darwin Index: TODO =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TODO 3 Jun 2005 20:28:25 -0000 1.6 --- TODO 9 Jun 2005 06:23:07 -0000 1.7 *************** *** 1,4 **** ! - fixed Pd.app file associations - create old-style Help->Pure Documentation link on Help menu. It should use a --- 1,7 ---- ! - convert the wget sf dev listing line in darwin_app_readme from wget to curl ! so it works out-of-box on macosx ! ! - fix Pd.app file associations - create old-style Help->Pure Documentation link on Help menu. It should use a *************** *** 22,28 **** - include auto-.pdrc script in package somewhere... - - make a web page that has stuff that can't be included due to license issues: - (percolate) - - create Tcl script called from Prefs that creates links for the standard unix - locations for files that are in bin, include, man inside $(PD_FILE_ROOT) --- 25,28 ---- *************** *** 37,44 **** command habits work in Pd as well - - make Cmd-H and Alt-Cmd-H work when the Alt key is spec'ed - - - create --enable-cpu and --enable-arch in pd/src/configure.in - - create general optimization flag system --- 37,40 ---- *************** *** 46,48 **** __gnu_linux__) while I am at it ! - add context (diff -u) to all patches --- 42,50 ---- __gnu_linux__) while I am at it ! ! ! ------------------------------------------------------------------------------ ! semi-abandoned TODOs ! ! - make a web page that has stuff that can't be included due to license issues: ! (percolate)

1 0

[PD-cvs] packages/darwin_app/patches MACOSX-to-__APPLE__.patch, NONE, 1.1 darwin_build-0.38.patch, 1.2, NONE u_main.tk.patch, 1.1, NONE
by Hans-Christoph Steiner 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/packages/darwin_app/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6321/patches Added Files: MACOSX-to-__APPLE__.patch Removed Files: darwin_build-0.38.patch u_main.tk.patch Log Message: cleaned up build system, tweaked flext build --- darwin_build-0.38.patch DELETED --- --- u_main.tk.patch DELETED --- --- NEW FILE: MACOSX-to-__APPLE__.patch --- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.10 diff -u -w -r1.10 configure.in --- configure.in 30 May 2005 04:37:25 -0000 1.10 +++ configure.in 9 Jun 2005 06:01:51 -0000 @@ -218,7 +218,7 @@ -framework AudioUnit -framework AudioToolbox \ -framework Carbon -framework CoreMIDI" EXT=pd_darwin - MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ + MORECFLAGS="-DUNISTD -I/usr/X11R6/include \ -I../portaudio/pa_common -I../portaudio/pablio \ -I../portmidi/pm_common -I../portmidi/pm_mac \ -I../portmidi/porttime \ Index: d_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_array.c,v retrieving revision 1.5 diff -u -w -r1.5 d_array.c --- d_array.c 11 Nov 2004 04:58:21 -0000 1.5 +++ d_array.c 9 Jun 2005 06:01:51 -0000 @@ -540,12 +540,12 @@ #define int32 int32_t #else -#ifdef MACOSX +#ifdef __APPLE__ #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 /* __APPLE__ */ #endif /* __linux__ */ #endif /* MSW */ #endif /* SGI */ Index: d_osc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_osc.c,v retrieving revision 1.2 diff -u -w -r1.2 d_osc.c --- d_osc.c 6 Sep 2004 20:20:33 -0000 1.2 +++ d_osc.c 9 Jun 2005 06:01:51 -0000 @@ -56,12 +56,12 @@ #define int32 int32_t #else -#ifdef MACOSX +#ifdef __APPLE__ #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 /* __APPLE__ */ #endif /* __linux__ */ #endif /* MSW */ #endif /* SGI */ Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.7 diff -u -w -r1.7 g_canvas.c --- g_canvas.c 18 May 2005 04:28:50 -0000 1.7 +++ g_canvas.c 9 Jun 2005 06:01:51 -0000 @@ -25,7 +25,7 @@ #define GLIST_DEFCANVASWIDTH 450 #define GLIST_DEFCANVASHEIGHT 300 -#ifdef MACOSX +#ifdef __APPLE__ #define GLIST_DEFCANVASYLOC 22 #else #define GLIST_DEFCANVASYLOC 0 Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.7 diff -u -w -r1.7 g_editor.c --- g_editor.c 18 May 2005 04:28:50 -0000 1.7 +++ g_editor.c 9 Jun 2005 06:01:52 -0000 @@ -949,7 +949,7 @@ /* on one-button-mouse machines, you can use double click to mean right click (which gets the popup menu.) Do this for Mac. */ -#ifdef MACOSX +#ifdef __APPLE__ #define SIMULATERIGHTCLICK #endif @@ -1412,7 +1412,7 @@ keyupsym = gensym("#keyup"); keynamesym = gensym("#keyname"); } -#ifdef MACOSX +#ifdef __APPLE__ if (keynum == 30) keynum = 0, gotkeysym = gensym("Up"); else if (keynum == 31) Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.7 diff -u -w -r1.7 g_text.c --- g_text.c 18 May 2005 04:28:51 -0000 1.7 +++ g_text.c 9 Jun 2005 06:01:52 -0000 @@ -1100,7 +1100,7 @@ /* -------------------- the "text" class ------------ */ -#ifdef MACOSX +#ifdef __APPLE__ #define EXTRAPIX 2 #else #define EXTRAPIX 1 Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.5 diff -u -w -r1.5 s_file.c --- s_file.c 30 May 2005 03:04:18 -0000 1.5 +++ s_file.c 9 Jun 2005 06:01:52 -0000 @@ -205,7 +205,7 @@ #endif /* MSW */ -#ifdef MACOSX +#ifdef __APPLE__ static void sys_initloadpreferences( void) { @@ -255,7 +255,7 @@ { } -#endif /* MACOSX */ +#endif /* __APPLE__ */ void sys_loadpreferences( void) { Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.9 diff -u -w -r1.9 s_inter.c --- s_inter.c 30 May 2005 03:04:18 -0000 1.9 +++ s_inter.c 9 Jun 2005 06:01:53 -0000 @@ -40,7 +40,7 @@ #include <string.h> #include <stdio.h> -#ifdef MACOSX +#ifdef __APPLE__ #include <sys/types.h> #include <sys/stat.h> #include <pthread.h> @@ -1007,7 +1007,7 @@ else if (!childpid) /* we're the child */ { seteuid(getuid()); /* lose setuid priveliges */ -#ifndef MACOSX +#ifndef __APPLE__ /* the wish process in Unix will make a wish shell and read/write standard in and out unless we close the file descriptors. Somehow this doesn't make the MAC OSX @@ -1026,7 +1026,7 @@ #endif if (!sys_guicmd) { -#ifdef MACOSX +#ifdef __APPLE__ char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; if (!homedir || strlen(homedir) > 150) @@ -1165,7 +1165,7 @@ if (!SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS)) fprintf(stderr, "pd: couldn't set high priority class\n"); #endif -#ifdef MACOSX +#ifdef __APPLE__ if (sys_hipriority) { struct sched_param param; @@ -1177,7 +1177,7 @@ if (err) post("warning: high priority scheduling failed\n"); } -#endif /* MACOSX */ +#endif /* __APPLE__ */ if (!sys_nogui && !sys_guisetportnumber) { Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.6 diff -u -w -r1.6 s_loader.c --- s_loader.c 30 May 2005 03:04:19 -0000 1.6 +++ s_loader.c 9 Jun 2005 06:01:53 -0000 @@ -13,7 +13,7 @@ #include <io.h> #include <windows.h> #endif -#ifdef MACOSX +#ifdef __APPLE__ #include <mach-o/dyld.h> #endif #include <string.h> @@ -37,7 +37,7 @@ #ifdef __linux__ ".pd_linux"; #endif -#ifdef MACOSX +#ifdef __APPLE__ ".pd_darwin"; #endif #ifdef MSW @@ -90,7 +90,7 @@ if (lastdot = strrchr(nameptr, '.')) *lastdot = 0; -#ifdef MACOSX +#ifdef __APPLE__ strcpy(symname, "_"); strcat(symname, nameptr); #else @@ -122,7 +122,7 @@ } makeout = (t_xxx)GetProcAddress(ntdll, symname); #endif -#ifdef MACOSX +#ifdef __APPLE__ { NSObjectFileImage image; void *ret; Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.6 diff -u -w -r1.6 s_path.c --- s_path.c 18 May 2005 04:28:51 -0000 1.6 +++ s_path.c 9 Jun 2005 06:01:53 -0000 @@ -356,7 +356,7 @@ } -/* Startup file reading for linux and MACOSX. As of 0.38 this will be +/* Startup file reading for linux and __APPLE__. As of 0.38 this will be deprecated in favor of the "settings" mechanism */ int sys_argparse(int argc, char **argv); Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.6 diff -u -w -r1.6 s_stuff.h --- s_stuff.h 28 Nov 2004 21:20:43 -0000 1.6 +++ s_stuff.h 9 Jun 2005 06:01:53 -0000 @@ -160,7 +160,7 @@ #define API_DEFAULT API_MMIO #define API_DEFSTRING "MMIO" #endif -#ifdef MACOSX +#ifdef __APPLE__ #define API_DEFAULT API_PORTAUDIO #define API_DEFSTRING "portaudio" #endif Index: t_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_main.c,v retrieving revision 1.2 diff -u -w -r1.2 t_main.c --- t_main.c 6 Sep 2004 20:20:36 -0000 1.2 +++ t_main.c 9 Jun 2005 06:01:53 -0000 @@ -14,7 +14,7 @@ */ -#ifndef MACOSX /* linux and IRIX only; in MACOSX we don't link this in */ +#ifndef __APPLE__ /* linux and IRIX only; in __APPLE__ we don't link this in */ #include "tk.h" #include <stdlib.h> @@ -112,4 +112,4 @@ return TCL_OK; } -#endif /* MACOSX */ +#endif /* __APPLE__ */ Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.3 diff -u -w -r1.3 t_tkcmd.c --- t_tkcmd.c 6 Nov 2004 16:07:34 -0000 1.3 +++ t_tkcmd.c 9 Jun 2005 06:01:53 -0000 @@ -40,7 +40,7 @@ #include "tk.h" #endif -#ifdef MACOSX +#ifdef __APPLE__ #define STARTGUI #endif @@ -528,7 +528,7 @@ /* in linux, we load the tk code from here (in MSW and MACOS, this is done by passing the name of the file as a startup argument to the wish shell.) */ -#if !defined(MSW) && !defined(MACOSX) +#if !defined(MSW) && !defined(__APPLE__) void pdgui_doevalfile(Tcl_Interp *interp, char *s) { char buf[GUISTRING]; @@ -566,7 +566,7 @@ #endif pdgui_setupsocket(); /* read in the startup file */ -#if !defined(MSW) && !defined(MACOSX) +#if !defined(MSW) && !defined(__APPLE__) pdgui_evalfile("pd.tk"); #endif } Index: x_arithmetic.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_arithmetic.c,v retrieving revision 1.2 diff -u -w -r1.2 x_arithmetic.c --- x_arithmetic.c 6 Sep 2004 20:20:36 -0000 1.2 +++ x_arithmetic.c 9 Jun 2005 06:01:53 -0000 @@ -11,7 +11,7 @@ /* MSW and OSX don't appear to have single-precision ANSI math */ -#if defined(MSW) || defined(MACOSX) +#if defined(MSW) || defined(__APPLE__) #define sinf sin #define cosf cos #define atanf atan Index: x_misc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_misc.c,v retrieving revision 1.2 diff -u -w -r1.2 x_misc.c --- x_misc.c 6 Sep 2004 20:20:36 -0000 1.2 +++ x_misc.c 9 Jun 2005 06:01:53 -0000 @@ -21,7 +21,7 @@ #include <time.h> #endif -#if defined (MACOSX) || defined (__FreeBSD__) +#if defined (__APPLE__) || defined (__FreeBSD__) #define HZ CLK_TCK #endif

1 0

[PD-cvs] packages/darwin_app/patches darwin_linking_fixes.patch, 1.2, 1.3
by Hans-Christoph Steiner 09 Jun '05

09 Jun '05

Update of /cvsroot/pure-data/packages/darwin_app/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19430 Modified Files: darwin_linking_fixes.patch Log Message: changed Jack linking to 'weak' Index: darwin_linking_fixes.patch =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/patches/darwin_linking_fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** darwin_linking_fixes.patch 6 Jun 2005 23:47:18 -0000 1.2 --- darwin_linking_fixes.patch 9 Jun 2005 05:44:27 -0000 1.3 *************** *** 5,9 **** diff -u -w -r1.10 configure.in --- configure.in 30 May 2005 04:37:25 -0000 1.10 ! +++ configure.in 6 Jun 2005 23:45:51 -0000 @@ -13,6 +13,7 @@ AC_SUBST(USE_DEBUG_CFLAGS, no) --- 5,9 ---- diff -u -w -r1.10 configure.in --- configure.in 30 May 2005 04:37:25 -0000 1.10 ! +++ configure.in 7 Jun 2005 00:14:52 -0000 @@ -13,6 +13,7 @@ AC_SUBST(USE_DEBUG_CFLAGS, no) *************** *** 14,18 **** AC_SUBST(GUIFLAGS) AC_SUBST(OSNUMBER) ! @@ -207,6 +210,24 @@ OPT_CFLAGS="-g" else --- 14,18 ---- AC_SUBST(GUIFLAGS) AC_SUBST(OSNUMBER) ! @@ -207,6 +208,24 @@ OPT_CFLAGS="-g" else *************** *** 39,43 **** echo OPT_CFLAGS --------------- $OPT_CFLAGS OSNUMBER=0 ! @@ -245,24 +266,41 @@ ../portmidi/pm_common/portmidi.c \ ../portmidi/porttime/ptmacosx_cf.c " --- 39,43 ---- echo OPT_CFLAGS --------------- $OPT_CFLAGS OSNUMBER=0 ! @@ -245,11 +264,25 @@ ../portmidi/pm_common/portmidi.c \ ../portmidi/porttime/ptmacosx_cf.c " *************** *** 70,76 **** then OPT_CFLAGS="-g" ! else ! - OPT_CFLAGS="-O2" ! + OPT_CFLAGS="-O2 -fast -fPIC -mcpu=7450 -faltivec" fi OSNUMBER=2 --- 70,74 ---- then OPT_CFLAGS="-g" ! @@ -258,11 +291,14 @@ fi OSNUMBER=2 *************** *** 79,93 **** if test x$jack == "xyes"; then ! LDFLAGS=$LDFLAGS" -framework Jack" - MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" - SYSSRC=$SYSSRC" s_audio_jack.c" + fi + if test x$jack == "xrun"; + then ! + LDFLAGS=$LDFLAGS" -framework Jack" fi fi ! @@ -272,13 +310,11 @@ then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" --- 77,92 ---- if test x$jack == "xyes"; then ! - LDFLAGS=$LDFLAGS" -framework Jack" - MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" - SYSSRC=$SYSSRC" s_audio_jack.c" + + LDFLAGS=$LDFLAGS" -weak_framework Jack" + fi + if test x$jack == "xrun"; + then ! + LDFLAGS=$LDFLAGS" -weak_framework Jack" fi fi ! @@ -272,13 +308,11 @@ then MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK" *************** *** 109,113 **** diff -u -w -r1.6 makefile.in --- makefile.in 18 May 2005 04:28:51 -0000 1.6 ! +++ makefile.in 6 Jun 2005 23:45:51 -0000 @@ -97,11 +97,17 @@ cp u_main.tk $(BIN_DIR)/pd.tk --- 108,112 ---- diff -u -w -r1.6 makefile.in --- makefile.in 18 May 2005 04:28:51 -0000 1.6 ! +++ makefile.in 7 Jun 2005 00:14:52 -0000 @@ -97,11 +97,17 @@ cp u_main.tk $(BIN_DIR)/pd.tk *************** *** 139,143 **** diff -u -w -r1.9 u_main.tk --- u_main.tk 18 May 2005 04:28:51 -0000 1.9 ! +++ u_main.tk 6 Jun 2005 23:45:52 -0000 @@ -48,7 +48,7 @@ global pd_tearoff --- 138,142 ---- diff -u -w -r1.9 u_main.tk --- u_main.tk 18 May 2005 04:28:51 -0000 1.9 ! +++ u_main.tk 7 Jun 2005 00:14:52 -0000 @@ -48,7 +48,7 @@ global pd_tearoff

1 0

externals/zexy/src msgfile.c,1.2,1.3
by IOhannes m zmölnig 08 Jun '05

08 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20418 Modified Files: msgfile.c Log Message: hopefully fixed a bug with not finding relative filenames (when "." was not in the path) Index: msgfile.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** msgfile.c 19 May 2005 09:42:55 -0000 1.2 --- msgfile.c 8 Jun 2005 17:07:21 -0000 1.3 *************** *** 516,521 **** int fd; long readlength, length; ! char filnam[MAXPDSTRING]; char buf[MAXPDSTRING], *bufptr, *readbuf; int mode = x->mode; --- 516,522 ---- int fd; long readlength, length; ! char filnam[MAXPDSTRING], namebuf[MAXPDSTRING]; char buf[MAXPDSTRING], *bufptr, *readbuf; + char*dirname=canvas_getdir(x->x_canvas)->s_name; int mode = x->mode; *************** *** 524,540 **** t_binbuf *bbuf = binbuf_new(); ! if ((fd = open_via_path(canvas_getdir(x->x_canvas)->s_name, filename->s_name, "", buf, &bufptr, MAXPDSTRING, 0)) < 0) { ! error("%s: can't open", filename->s_name); ! return; ! } ! else close (fd); ! if (!strcmp(format->s_name, "cr")) { mode = CR_MODE; ! } else if (!strcmp(format->s_name, "csv")) { mode = CSV_MODE; ! } else if (!strcmp(format->s_name, "pd")) { mode = PD_MODE; } else if (*format->s_name) --- 525,562 ---- t_binbuf *bbuf = binbuf_new(); ! ! #ifdef NT ! rmode |= O_BINARY; ! #endif ! ! if ((fd = open_via_path(dirname, filename->s_name, "", buf, &bufptr, MAXPDSTRING, 0)) < 0) { ! ! if(fd=open(filename->s_name, rmode) < 0) { ! error("%s: can't open in %s", filename->s_name, dirname); ! return; ! } ! } else { close (fd); ! namebuf[0] = 0; ! if (*buf) ! strcat(namebuf, buf), strcat(namebuf, "/"); ! strcat(namebuf, bufptr); ! ! /* open and get length */ ! sys_bashfilename(namebuf, filnam); ! ! if ((fd = open(filnam, rmode)) < 0) { ! error("msgfile_read: unable to open %s", filnam); ! return; ! } ! } ! ! if (gensym("cr")==format) { mode = CR_MODE; ! } else if (gensym("csv")==format) { mode = CSV_MODE; ! } else if (gensym("pd")==format) { mode = PD_MODE; } else if (*format->s_name) *************** *** 556,570 **** } - /* open and get length */ - sys_bashfilename(filename->s_name, filnam); - - #ifdef NT - rmode |= O_BINARY; - #endif - - if ((fd = open(filnam, rmode)) < 0) { - error("msgfile_read: unable to open %s", filnam); - return; - } if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0,SEEK_SET) < 0 || !(readbuf = t_getbytes(length))) { --- 578,581 ----

1 0

packages/darwin_app Makefile,1.13,1.14
by Thomas Grill 08 Jun '05

08 Jun '05

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12527 Modified Files: Makefile Log Message: updates for flext build Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 6 Jun 2005 02:38:27 -0000 1.13 --- Makefile 8 Jun 2005 16:50:07 -0000 1.14 *************** *** 4,8 **** --- 4,11 ---- PD_APP_NAME = Pd + ifndef DESTDIR DESTDIR = installroot + endif + PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources *************** *** 298,311 **** ( \ ( \ ! cat buildsys/config-mac-pd-gcc.txt | \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" > ____c && \ ! cp ____c buildsys/config-mac-pd-gcc.txt && rm -f ____c \ ! ) || \ ! ( \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" buildsys/mac/pd/config-gcc.def > buildsys/config-mac-pd-gcc.txt \ ! ) \ ) && \ ( \ ! cp -f build/config-mac.def config.txt \ ) && \ bash build.sh pd gcc build-release-shared --- 301,320 ---- ( \ ( \ ! test -f buildsys/config-mac-pd-gcc.txt || \ ! ( \ ! cp buildsys/mac/pd/config-gcc.def buildsys/config-mac-pd-gcc.txt && \ ! echo Copied template sys config file \ ! ) \ ! ) && \ ! cat buildsys/config-mac-pd-gcc.txt | \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" | \ ! sed "s/^FLEXTPREFIX=.*/FLEXTPREFIX=@executable_path\/..\/extra/" > buildsys/config-mac-pd-gcc.txt \ ) && \ ( \ ! test -f config.txt || \ ! ( \ ! cp -f build/config-mac.def config.txt && \ ! echo Copied template flext config file \ ! ) \ ) && \ bash build.sh pd gcc build-release-shared *************** *** 384,390 **** ########## FOOTILS ######### # syncgrain ! cd ../../externals/footils/syncgrain/ && make -f makefile.pd-darwin ! install -p -m0444 ../../externals/footils/syncgrain/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) ! install -p -m0644 ../../externals/footils/syncgrain/pd/*.* $(HELP_DIR)/5.reference --- 393,399 ---- ########## FOOTILS ######### # syncgrain ! # cd ../../externals/footils/syncgrain/ && make -f makefile.pd-darwin ! # install -p -m0444 ../../externals/footils/syncgrain/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) ! # install -p -m0644 ../../externals/footils/syncgrain/pd/*.* $(HELP_DIR)/5.reference

1 0

externals/grill/flext/source flsupport.h,1.92,1.93
by Thomas Grill 08 Jun '05

08 Jun '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9251/source Modified Files: flsupport.h Log Message: c++ conformance fix Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** flsupport.h 8 Jun 2005 11:41:21 -0000 1.92 --- flsupport.h 8 Jun 2005 14:42:15 -0000 1.93 *************** *** 666,669 **** --- 666,670 ---- AtomListStaticBase &operator =(const AtomList &a) { AtomList::operator =(a); return *this; } + AtomListStaticBase &operator =(const AtomListStaticBase &a) { AtomList::operator =(a); return *this; } const int precnt; *************** *** 685,688 **** --- 686,690 ---- //! Set list by another AtomList AtomListStatic &operator =(const AtomList &a) { AtomListStaticBase::operator =(a); return *this; } + AtomListStatic &operator =(const AtomListStatic &a) { AtomListStaticBase::operator =(a); return *this; } protected: t_atom pre[PRE];

1 0

externals/grill/flext/source flsupport.h,1.91,1.92
by Thomas Grill 08 Jun '05

08 Jun '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5903/source Modified Files: flsupport.h Log Message: c++ conformance fix Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** flsupport.h 7 Jun 2005 14:40:18 -0000 1.91 --- flsupport.h 8 Jun 2005 11:41:21 -0000 1.92 *************** *** 665,668 **** --- 665,670 ---- virtual void Free(); + AtomListStaticBase &operator =(const AtomList &a) { AtomList::operator =(a); return *this; } + const int precnt; t_atom *const predata; *************** *** 679,686 **** explicit AtomListStatic(int argc,const t_atom *argv = NULL): AtomListStaticBase(PRE,pre) { operator()(argc,argv); } //! Construct list ! explicit AtomListStatic(const AtomList &a): AtomListStaticBase(PRE,pre) { AtomList::operator =(a); } //! Set list by another AtomList ! AtomListStatic &operator =(const AtomList &a) { AtomList::operator =(a); return *this; } protected: t_atom pre[PRE]; --- 681,688 ---- explicit AtomListStatic(int argc,const t_atom *argv = NULL): AtomListStaticBase(PRE,pre) { operator()(argc,argv); } //! Construct list ! explicit AtomListStatic(const AtomList &a): AtomListStaticBase(PRE,pre) { operator =(a); } //! Set list by another AtomList ! AtomListStatic &operator =(const AtomList &a) { AtomListStaticBase::operator =(a); return *this; } protected: t_atom pre[PRE];

1 0

externals/bbogart/popup popup.c,1.16,1.17
by IOhannes m zmölnig 07 Jun '05

07 Jun '05

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19319 Modified Files: popup.c Log Message: fixed a bug that crashed pd when deleting a popup-in-a-gop that with inlets (of the popup) connected Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** popup.c 7 Jun 2005 15:07:53 -0000 1.16 --- popup.c 7 Jun 2005 18:09:55 -0000 1.17 *************** *** 312,316 **** t_text *x = (t_text *)z; ! canvas_deletelinesfor(glist_getcanvas(glist), x); DEBUG(post("delete end");) --- 312,316 ---- t_text *x = (t_text *)z; ! canvas_deletelinesfor(glist, x); DEBUG(post("delete end");)

1 0

externals/bbogart/popup popup.c,1.15,1.16
by IOhannes m zmölnig 07 Jun '05

07 Jun '05

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20409 Modified Files: popup.c Log Message: added "set"-message Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** popup.c 7 Jun 2005 08:49:23 -0000 1.15 --- popup.c 7 Jun 2005 15:07:53 -0000 1.16 *************** *** 484,487 **** --- 484,527 ---- } + /* Function to choose value via name/index but without outputting it*/ + static void popup_set(t_popup* x, t_symbol *S, int argc, t_atom*argv) + { + if(!argc)return; + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; + + if(argv->a_type==A_FLOAT) + { + int i=atom_getint(argv); + if( i<x->x_num_options && i>=0) + { + x->current_selection = i; + if(visible) + sys_vgui(".x%x.c.s%x configure -text \"%s\"\n", + glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name); + } else { + error("popup: Valid menu selections are from %d to %d\npopup: You entered %d.", 0, x->x_num_options-1, i); + } + } else if(argv->a_type==A_SYMBOL) + { + int i; + t_symbol*s=atom_getsymbol(argv); + /* Compare inlet symbol to each option */ + for(i=0; i<x->x_num_options; i++) + { + if(x->x_options[i]->s_name == s->s_name) + { + x->current_selection = i; + if(visible)sys_vgui(".x%x.c.s%x configure -text \"%s\"\n", + glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name); + return; + } + } + error("popup: '%s' is not an available option.", s->s_name); + } else + { + pd_error(x, "popup: can only 'set' symbols or floats"); + } + } + /* Function to append symbols to popup list */ static void popup_append(t_popup* x, t_symbol *s, int argc, t_atom *argv) *************** *** 642,645 **** --- 682,690 ---- 0); + class_addmethod(popup_class, (t_method)popup_set, + gensym("set"), + A_GIMME, + 0); + class_addmethod(popup_class, (t_method)popup_symselect, gensym(""),

1 0

externals/grill/flext/source fldefs_meththr.h, 1.3, 1.4 flsupport.h, 1.90, 1.91 flthr.cpp, 1.30, 1.31
by Thomas Grill 07 Jun '05

07 Jun '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7886/source Modified Files: fldefs_meththr.h flsupport.h flthr.cpp Log Message: cosmetic stuff corrections to config build templates digest one-element list messages as single atoms made flext::Forward threadsafe simplified message analysis Index: fldefs_meththr.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fldefs_meththr.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fldefs_meththr.h 26 Jan 2005 05:01:45 -0000 1.3 --- fldefs_meththr.h 7 Jun 2005 14:40:18 -0000 1.4 *************** *** 50,54 **** thisType *th = FLEXT_CAST<thisType *>(p->cl); \ bool ok = th->PushThread(); \ ! AtomAnything *args = p->var[0]._any.args; \ delete p; \ if(ok) { \ --- 50,54 ---- thisType *th = FLEXT_CAST<thisType *>(p->cl); \ bool ok = th->PushThread(); \ ! AtomAnything *args = p->var[0]._any; \ delete p; \ if(ok) { \ *************** *** 68,72 **** thisType *th = FLEXT_CAST<thisType *>(p->cl); \ bool ok = th->PushThread(); \ ! AtomList *args = p->var[0]._list.args; \ delete p; \ if(ok) { \ --- 68,72 ---- thisType *th = FLEXT_CAST<thisType *>(p->cl); \ bool ok = th->PushThread(); \ ! AtomList *args = p->var[0]._list; \ delete p; \ if(ok) { \ *************** *** 82,86 **** #define FLEXT_THREAD_X(M_FUN) \ static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,void *data) { \ ! thr_params *p = new thr_params; p->var[0]._ext.data = data; \ return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \ } \ --- 82,86 ---- #define FLEXT_THREAD_X(M_FUN) \ static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,void *data) { \ ! thr_params *p = new thr_params; p->var[0]._ext = data; \ return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \ } \ *************** *** 88,92 **** thisType *th = FLEXT_CAST<thisType *>(p->cl); \ bool ok = th->PushThread(); \ ! void *data = p->var[0]._ext.data; \ delete p; \ if(ok) { \ --- 88,92 ---- thisType *th = FLEXT_CAST<thisType *>(p->cl); \ bool ok = th->PushThread(); \ ! void *data = p->var[0]._ext; \ delete p; \ if(ok) { \ Index: flthr.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flthr.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** flthr.cpp 7 Jun 2005 14:13:49 -0000 1.30 --- flthr.cpp 7 Jun 2005 14:40:19 -0000 1.31 *************** *** 105,111 **** - flext::thrid_t flext::GetSysThreadId() { return thrid; } - - static void LaunchHelper(thr_entry *e) { --- 105,108 ---- *************** *** 602,607 **** flext_base::thr_params::~thr_params() { if(var) delete[] var; } ! void flext_base::thr_params::set_any(const t_symbol *s,int argc,const t_atom *argv) { var[0]._any.args = new AtomAnything(s,argc,argv); } ! void flext_base::thr_params::set_list(int argc,const t_atom *argv) { var[0]._list.args = new AtomList(argc,argv); } --- 599,604 ---- flext_base::thr_params::~thr_params() { if(var) delete[] var; } ! void flext_base::thr_params::set_any(const t_symbol *s,int argc,const t_atom *argv) { var[0]._any = new AtomAnything(s,argc,argv); } ! void flext_base::thr_params::set_list(int argc,const t_atom *argv) { var[0]._list = new AtomList(argc,argv); } Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** flsupport.h 7 Jun 2005 14:13:49 -0000 1.90 --- flsupport.h 7 Jun 2005 14:40:18 -0000 1.91 *************** *** 782,790 **** //! @} FLEXT_S_LOCK - #ifdef FLEXT_THREADS /*! \defgroup FLEXT_S_THREAD Flext thread handling @{ */ //! thread type #if FLEXT_THREADS == FLEXT_THR_MP --- 782,800 ---- //! @} FLEXT_S_LOCK /*! \defgroup FLEXT_S_THREAD Flext thread handling @{ */ + //! Check if current thread is the realtime system's thread + static bool IsSystemThread() { + #ifdef FLEXT_THREADS + return IsThread(GetSysThreadId()); + #else + return true; + #endif + } + + #ifdef FLEXT_THREADS + //! thread type #if FLEXT_THREADS == FLEXT_THR_MP *************** *** 814,818 **** /*! \brief Get system thread id */ ! static thrid_t GetSysThreadId(); //! Check if current thread should terminate --- 824,828 ---- /*! \brief Get system thread id */ ! static thrid_t GetSysThreadId() { return thrid; } //! Check if current thread should terminate *************** *** 830,836 **** } - //! Check if current thread is the realtime system's thread - static bool IsSystemThread() { return IsThread(GetSysThreadId()); } - /*! \brief Thread parameters --- 840,843 ---- *************** *** 853,859 **** int _int; t_symptr _t_symptr; ! struct { AtomAnything *args; } _any; ! struct { AtomList *args; } _list; ! struct { void *data; } _ext; } *var; }; --- 860,866 ---- int _int; t_symptr _t_symptr; ! AtomAnything *_any; ! AtomList *_list; ! void *_ext; } *var; }; *************** *** 1094,1102 **** static bool StopThread(void (*meth)(thr_params *p),thr_params *params = NULL,bool wait = false); - //! @} FLEXT_S_THREAD - - #endif // FLEXT_THREADS // --- timer stuff ----------------------------------------------- --- 1101,1108 ---- static bool StopThread(void (*meth)(thr_params *p),thr_params *params = NULL,bool wait = false); #endif // FLEXT_THREADS + //! @} FLEXT_S_THREAD + // --- timer stuff -----------------------------------------------

1 0

← Newer
1
...
14
15
16
17
18
19
20
21
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs June 2005