[PD-cvs] pd/src configure.in,1.6,1.7 makefile,1.7,1.8 notes.txt,1.7,1.8 s_audio_pablio.c,1.2,1.3 s_path.c,1.4,1.5 u_main.tk,1.5,1.6 configure,1.5,NONE

Miller Puckette millerpuckette at users.sourceforge.net
Sun Nov 7 05:04:21 CET 2004


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7929/pd/src

Modified Files:
	configure.in makefile notes.txt s_audio_pablio.c s_path.c 
	u_main.tk 
Removed Files:
	configure 
Log Message:
more bug fixes.  Possible to put spaces in path and startup dialog entries.




Index: notes.txt
===================================================================
RCS file: /cvsroot/pure-data/pd/src/notes.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** notes.txt	6 Nov 2004 16:07:33 -0000	1.7
--- notes.txt	7 Nov 2004 04:04:18 -0000	1.8
***************
*** 32,35 ****
--- 32,37 ----
  bug fix: CK on Oct. 4 (crash changing font size)
  sched_idle hook
+ fixed startup flags, path, etc. so that spaces, "," chars, etc., are allowed
+ configure script fixed to handle enable- and disable- correctly
  
  doc:
***************
*** 39,45 ****
  
  problems:
- --enable-alsa actually disables it???
- startup flags need to handle spaces, duh.
- test MIDI I/O on all platforms, inc. sysex...
  '[' in numbox label breaks it (Yury Sept. 3)
  soundfiles with 3-byte samples buzz for the first readsf buffer (bug/x.pd)
--- 41,44 ----
***************
*** 62,72 ****
  data copy/paste doesn't check templates aren't changed
  figure out why Pd sometimes crashes when you close example after adding fields
  
  next release:
  pixel font sizes
  pd to find running ones (pd -new to defeat)
  "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?)
- portaudio v19?
  tables:
      if there's just one array, don't do stringent hit check.
--- 61,73 ----
  data copy/paste doesn't check templates aren't changed
  figure out why Pd sometimes crashes when you close example after adding fields
+ check if _vsnprintf with zero argument in windows works any better...
  
  next release:
+ update portmusic to latest
+ IEM guis to use queued updates
  pixel font sizes
  pd to find running ones (pd -new to defeat)
  "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:
      if there's just one array, don't do stringent hit check.

Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** u_main.tk	6 Nov 2004 16:07:34 -0000	1.5
--- u_main.tk	7 Nov 2004 04:04:18 -0000	1.6
***************
*** 176,179 ****
--- 176,180 ----
  ################ utility functions #########################
  
+ # enquote a string to send it to a tcl function
  proc pdtk_enquote {x} {
      set foo [string map {"," "" ";" "" \" ""} $x]
***************
*** 182,185 ****
--- 183,196 ----
  }
  
+ #enquote a string to send it to Pd.  Blow off semi and comma; alias spaces
+ proc pdtk_unspace {x} {
+     string map {" " "_" ";" "" "," ""} $x
+ }
+ 
+ #enquote a string for preferences (command strings etc.)
+ proc pdtk_encodedialog {x} {
+     concat +[string map {" " "+_" "$" "+d" ";" "+s" "," "+c" "+" "++"} $x]
+ }
+ 
  proc pdtk_debug {x} {
      tk_messageBox -message $x -type ok
***************
*** 1338,1342 ****
  	}
      }
!     concat $ret
  }
  
--- 1349,1353 ----
  	}
      }
!     pdtk_unspace $ret
  }
  
***************
*** 2021,2027 ****
         set hhhgui_nam [string replace $hhhgui_nam 0 0 #] }
      
!     set hhhsnd [string map {" " _} $hhhsnd]
!     set hhhrcv [string map {" " _} $hhhrcv]
!     set hhhgui_nam [string map {" " _} $hhhgui_nam]
      
      pd [concat $id dialog \
--- 2032,2038 ----
         set hhhgui_nam [string replace $hhhgui_nam 0 0 #] }
      
!     set hhhsnd [pdtk_unspace $hhhsnd]
!     set hhhrcv [pdtk_unspace $hhhrcv]
!     set hhhgui_nam [pdtk_unspace $hhhgui_nam]
      
      pd [concat $id dialog \
***************
*** 3405,3413 ****
  
      pd [concat pd path-dialog $pd_extrapath $pd_verbose \
!     [pdtk_enquote $pd_path0] [pdtk_enquote $pd_path1] \
!     [pdtk_enquote $pd_path2] [pdtk_enquote $pd_path3] \
!     [pdtk_enquote $pd_path4] [pdtk_enquote $pd_path5] \
!     [pdtk_enquote $pd_path6] [pdtk_enquote $pd_path7] \
!     [pdtk_enquote $pd_path8] [pdtk_enquote $pd_path9] \;]
  }
  
--- 3416,3424 ----
  
      pd [concat pd path-dialog $pd_extrapath $pd_verbose \
!     [pdtk_encodedialog $pd_path0] [pdtk_encodedialog $pd_path1] \
!     [pdtk_encodedialog $pd_path2] [pdtk_encodedialog $pd_path3] \
!     [pdtk_encodedialog $pd_path4] [pdtk_encodedialog $pd_path5] \
!     [pdtk_encodedialog $pd_path6] [pdtk_encodedialog $pd_path7] \
!     [pdtk_encodedialog $pd_path8] [pdtk_encodedialog $pd_path9] \;]
  }
  
***************
*** 3477,3486 ****
      global pd_startup5 pd_startup6 pd_startup7 pd_startup8 pd_startup9 
  
!     pd [concat pd startup-dialog $pd_nort [pdtk_enquote $pd_flags] \
!     [pdtk_enquote $pd_startup0] [pdtk_enquote $pd_startup1] \
!     [pdtk_enquote $pd_startup2] [pdtk_enquote $pd_startup3] \
!     [pdtk_enquote $pd_startup4] [pdtk_enquote $pd_startup5] \
!     [pdtk_enquote $pd_startup6] [pdtk_enquote $pd_startup7] \
!     [pdtk_enquote $pd_startup8] [pdtk_enquote $pd_startup9] \;]
  
  }
--- 3488,3497 ----
      global pd_startup5 pd_startup6 pd_startup7 pd_startup8 pd_startup9 
  
!     pd [concat pd startup-dialog $pd_nort [pdtk_encodedialog $pd_flags] \
!     [pdtk_encodedialog $pd_startup0] [pdtk_encodedialog $pd_startup1] \
!     [pdtk_encodedialog $pd_startup2] [pdtk_encodedialog $pd_startup3] \
!     [pdtk_encodedialog $pd_startup4] [pdtk_encodedialog $pd_startup5] \
!     [pdtk_encodedialog $pd_startup6] [pdtk_encodedialog $pd_startup7] \
!     [pdtk_encodedialog $pd_startup8] [pdtk_encodedialog $pd_startup9] \;]
  
  }

Index: s_path.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_path.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_path.c	6 Nov 2004 16:07:34 -0000	1.4
--- s_path.c	7 Nov 2004 04:04:18 -0000	1.5
***************
*** 472,475 ****
--- 472,509 ----
  }
  
+ /* undo pdtl_encodedialog.  This allows dialogs to send spaces, commas,
+     dollars, and semis down here. */
+ t_symbol *sys_decodedialog(t_symbol *s)
+ {
+     char buf[MAXPDSTRING], *sp = s->s_name;
+     int i;
+     if (*sp != '+')
+         bug("sys_decodedialog: %s", sp);
+     else sp++;
+     for (i = 0; i < MAXPDSTRING-1; i++)
+     {
+         if (!sp[0])
+             break;
+         if (sp[0] == '+')
+         {
+             if (sp[1] == '_')
+                 buf[i] = ' ', sp++;
+             else if (sp[1] == '+')
+                 buf[i] = '+', sp++;
+             else if (sp[1] == 'c')
+                 buf[i] = ',', sp++;
+             else if (sp[1] == 's')
+                 buf[i] = ';', sp++;
+             else if (sp[1] == 'd')
+                 buf[i] = '$', sp++;
+             else buf[i] = sp[0];
+             sp++;
+         }
+     }
+     buf[i] = 0;
+     return (gensym(buf));
+ }
+ 
+ 
      /* start a search path dialog window */
  void glob_start_path_dialog(t_pd *dummy)
***************
*** 496,502 ****
      sys_usestdpath = atom_getintarg(0, argc, argv);
      sys_verbose = atom_getintarg(1, argc, argv);
!     for (i = 0; i < argc; i++)
      {
!         t_symbol *s = atom_getsymbolarg(i+2, argc, argv);
          if (*s->s_name)
              sys_searchpath = namelist_append_files(sys_searchpath, s->s_name);
--- 530,536 ----
      sys_usestdpath = atom_getintarg(0, argc, argv);
      sys_verbose = atom_getintarg(1, argc, argv);
!     for (i = 0; i < argc-2; i++)
      {
!         t_symbol *s = sys_decodedialog(atom_getsymbolarg(i+2, argc, argv));
          if (*s->s_name)
              sys_searchpath = namelist_append_files(sys_searchpath, s->s_name);
***************
*** 528,535 ****
      sys_externlist = 0;
      sys_defeatrt = atom_getintarg(0, argc, argv);
!     sys_flags = atom_getsymbolarg(1, argc, argv);
!     for (i = 0; i < argc; i++)
      {
!         t_symbol *s = atom_getsymbolarg(i+2, argc, argv);
          if (*s->s_name)
              sys_externlist = namelist_append_files(sys_externlist, s->s_name);
--- 562,569 ----
      sys_externlist = 0;
      sys_defeatrt = atom_getintarg(0, argc, argv);
!     sys_flags = sys_decodedialog(atom_getsymbolarg(1, argc, argv));
!     for (i = 0; i < argc-2; i++)
      {
!         t_symbol *s = sys_decodedialog(atom_getsymbolarg(i+2, argc, argv));
          if (*s->s_name)
              sys_externlist = namelist_append_files(sys_externlist, s->s_name);

Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.in	6 Nov 2004 16:07:33 -0000	1.6
--- configure.in	7 Nov 2004 04:04:17 -0000	1.7
***************
*** 10,14 ****
  AC_SUBST(EXT)
  AC_SUBST(OPT_CFLAGS)
! AC_SUBST(USE_OPT_CFLAGS, yes)
  AC_SUBST(SYSSRC)
  AC_SUBST(STRIPFLAG)
--- 10,14 ----
  AC_SUBST(EXT)
  AC_SUBST(OPT_CFLAGS)
! AC_SUBST(USE_DEBUG_CFLAGS, no)
  AC_SUBST(SYSSRC)
  AC_SUBST(STRIPFLAG)
***************
*** 22,37 ****
  dnl check for features
  
! AC_ARG_ENABLE(alsa,     [  --disable-alsa          force disabling ALSA],
!     alsa="no")
  AC_ARG_ENABLE(jack,     [  --enable-jack           jack audio server],
!     jack="yes")
  AC_ARG_ENABLE(portaudio,[  --enable-portaudio      portaudio],
!     portaudio="yes")
  AC_ARG_ENABLE(debug,    [  --enable-debug          debugging support],
!     USE_OPT_CFLAGS="no")
  AC_ARG_ENABLE(static,   [  --enable-static         link statically],
!     static=yes)
  AC_ARG_ENABLE(setuid,   [  --enable-setuid         install as setuid (linux)],
!     setuid=yes)
      
  dnl Checks for programs.
--- 22,37 ----
  dnl check for features
  
! AC_ARG_ENABLE(alsa,     [  --enable-alsa           alsa audio driver], 
!     alsa=$enableval)
  AC_ARG_ENABLE(jack,     [  --enable-jack           jack audio server],
!     jack=$enableval)
  AC_ARG_ENABLE(portaudio,[  --enable-portaudio      portaudio],
!     portaudio=$enableval)
  AC_ARG_ENABLE(debug,    [  --enable-debug          debugging support],
!     USE_DEBUG_CFLAGS="no")
  AC_ARG_ENABLE(static,   [  --enable-static         link statically],
!     static=$enableval)
  AC_ARG_ENABLE(setuid,   [  --enable-setuid         install as setuid (linux)],
!     setuid=$enableval)
      
  dnl Checks for programs.
***************
*** 145,152 ****
  then
      dnl Ckecking for ALSA
! 
  dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
      if test x$alsa == xyes; then
- 	echo yes ... alsa is... $alsa
  	AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="no")
      fi
--- 145,151 ----
  then
      dnl Ckecking for ALSA
!     echo .................... alsa= $alsa
  dnl This should be fixed so Pd can use ALSA shared libraries where appropriate.
      if test x$alsa == xyes; then
  	AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="no")
      fi
***************
*** 205,213 ****
      STRIPFLAG=-s
      GUINAME="pd-gui"
!     if test x$USE_OPT_CFLAGS == "xyes";
      then
- 	OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-     else
  	OPT_CFLAGS="-g"
      fi
      echo OPT_CFLAGS --------------- $OPT_CFLAGS
--- 204,212 ----
      STRIPFLAG=-s
      GUINAME="pd-gui"
!     if test x$USE_DEBUG_CFLAGS == "xyes";
      then
  	OPT_CFLAGS="-g"
+     else
+ 	OPT_CFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
      fi
      echo OPT_CFLAGS --------------- $OPT_CFLAGS
***************
*** 244,252 ****
          -I../../Frameworks/Tcl.framework/Versions/Current/Headers \
          -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders"
!     if test x$USE_OPT_CFLAGS == "xyes";
      then
- 	OPT_CFLAGS="-O2"
-     else
  	OPT_CFLAGS="-g"
      fi
      OSNUMBER=2
--- 243,251 ----
          -I../../Frameworks/Tcl.framework/Versions/Current/Headers \
          -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders"
!     if test x$USE_DEBUG_CFLAGS == "xyes";
      then
  	OPT_CFLAGS="-g"
+     else
+ 	OPT_CFLAGS="-O2"
      fi
      OSNUMBER=2

Index: makefile
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile	6 Nov 2004 16:07:33 -0000	1.7
--- makefile	7 Nov 2004 04:04:17 -0000	1.8
***************
*** 11,15 ****
  MANDIR = ${prefix}/man
  
! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD    	 -DUSEAPI_OSS         -I../portaudio/pa_common -I../portaudio/pablio         -I../portaudio/portmidi-macosx 	-fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA
  
  INCLUDE = -I.
--- 11,15 ----
  MANDIR = ${prefix}/man
  
! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD    	 -DUSEAPI_OSS         -I../portaudio/pa_common -I../portaudio/pablio         -I../portaudio/portmidi-macosx 	-fno-strict-aliasing
  
  INCLUDE = -I.
***************
*** 17,22 ****
  GLIB = -ltk8.4 -ltcl8.4  -lX11 -L/usr/X11R6/lib -lrt
  
! LDFLAGS = -Wl,-export-dynamic -lasound
! LIB =   -ldl -lpthread -lasound
  
  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
--- 17,22 ----
  GLIB = -ltk8.4 -ltcl8.4  -lX11 -L/usr/X11R6/lib -lrt
  
! LDFLAGS = -Wl,-export-dynamic
! LIB =   -ldl -lpthread
  
  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
***************
*** 29,33 ****
  # the sources
  
! SYSSRC += s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c
  
  SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
--- 29,33 ----
  # the sources
  
! SYSSRC += s_midi_oss.c s_audio_oss.c
  
  SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
***************
*** 95,100 ****
  
  $(BIN_DIR)/pd.tk: u_main.tk
! 	echo set pd_nt 0 > $(BIN_DIR)/pd.tk
! 	grep -v "set pd_nt" < u_main.tk >> $(BIN_DIR)/pd.tk
  
  #this is for Max OSX only...
--- 95,99 ----
  
  $(BIN_DIR)/pd.tk: u_main.tk
! 	cp u_main.tk $(BIN_DIR)/pd.tk
  
  #this is for Max OSX only...


--- configure DELETED ---





More information about the Pd-cvs mailing list