pd/src configure.in, 1.8, 1.9 d_fft.c, 1.2, 1.3 d_soundfile.c, 1.4, 1.5 g_array.c, 1.5, 1.6 g_template.c, 1.6, 1.7 makefile, 1.11, 1.12 makefile.dependencies, 1.3, 1.4 makefile.nt, 1.2, 1.3 notes.txt, 1.10, 1.11 s_file.c, 1.4, 1.5 s_inter.c, 1.8, 1.9 s_loader.c, 1.5, 1.6 s_main.c, 1.11, 1.12 s_midi_pm.c, 1.4, 1.5 x_connective.c, 1.4, 1.5 x_net.c, 1.2, 1.3 - Pd-cvs

30 May 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/src
Modified Files:
    configure.in d_fft.c d_soundfile.c g_array.c g_template.c 
    makefile makefile.dependencies makefile.nt notes.txt s_file.c 
    s_inter.c s_loader.c s_main.c s_midi_pm.c x_connective.c 
    x_net.c 
Log Message:
Remembered to update all the edited files.  Should now be in sync... will
have to test it though.
Index: s_loader.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** s_loader.c	18 May 2005 04:28:51 -0000	1.5
--- s_loader.c	30 May 2005 03:04:19 -0000	1.6
***************
*** 136,140 ****
          ret = NSLinkModule( image, filename, 
                 NSLINKMODULE_OPTION_BINDNOW |
-                //NSLINKMODULE_OPTION_PRIVATE |
                 NSLINKMODULE_OPTION_RETURN_ON_ERROR);
--- 136,139 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.in	18 May 2005 04:28:50 -0000	1.8
--- configure.in	30 May 2005 03:04:17 -0000	1.9
***************
*** 5,8 ****
--- 5,9 ----
  AC_SUBST(jack, no)
  AC_SUBST(portaudio, no)
+ AC_SUBST(portmidi, no)
  AC_SUBST(binarymode, -m755)
  AC_SUBST(PDLIB)
***************
*** 28,31 ****
--- 29,34 ----
  AC_ARG_ENABLE(portaudio,[  --enable-portaudio      portaudio],
      portaudio=$enableval)
+ AC_ARG_ENABLE(portmidi, [  --enable-portmidi       portmidi],
+     portmidi=$enableval)
  AC_ARG_ENABLE(debug,    [  --enable-debug          debugging support],
      USE_DEBUG_CFLAGS="no")
***************
*** 167,171 ****
      	 -DUSEAPI_OSS \
          -I../portaudio/pa_common -I../portaudio/pablio \
!         -I../portaudio/portmidi-macosx \
    -fno-strict-aliasing"
      SYSSRC="s_midi_oss.c s_audio_oss.c"
--- 170,175 ----
      	 -DUSEAPI_OSS \
          -I../portaudio/pa_common -I../portaudio/pablio \
!         -I../portmidi/pm_common \
!         -I../portmidi/pm_linux \
    -fno-strict-aliasing"
      SYSSRC="s_midi_oss.c s_audio_oss.c"
***************
*** 223,228 ****
      EXT=pd_darwin
      MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \
! 	 -I../portaudio_v18/pa_common -I../portaudio_v18/pablio \
! 	-I../portmidi_osx \
    -Wno-error \
    -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN"
--- 227,233 ----
      EXT=pd_darwin
      MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \
! 	 -I../portaudio/pa_common -I../portaudio/pablio \
! 	-I../portmidi/pm_common -I../portmidi/pm_mac \
! 	-I../portmidi/porttime \
    -Wno-error \
    -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN"
***************
*** 230,242 ****
      	s_audio_pablio.c     \
    s_audio_paring.c     \
! 	../portaudio_v18/pa_common/pa_lib.c \
! 	../portaudio_v18/pa_common/pa_trace.c \
! 	../portaudio_v18/pa_common/pa_convert.c \
! 	../portaudio_v18/pa_mac_core/pa_mac_core.c \
!         ../portmidi_osx/pmdarwin.c \
!         ../portmidi_osx/pmmacosx.c \
!         ../portmidi_osx/pmutil.c \
!         ../portmidi_osx/portmidi.c \
!         ../portmidi_osx/ptdarwin.c "
      STRIPFLAG=""
      GUINAME="pdtcl"
--- 235,247 ----
      	s_audio_pablio.c     \
    s_audio_paring.c     \
! 	../portaudio/pa_common/pa_lib.c \
! 	../portaudio/pa_common/pa_trace.c \
! 	../portaudio/pa_common/pa_convert.c \
! 	../portaudio/pa_mac_core/pa_mac_core.c \
!         ../portmidi/pm_mac/pmmac.c \
!         ../portmidi/pm_mac/pmmacosxcm.c \
!         ../portmidi/pm_common/pmutil.c \
!         ../portmidi/pm_common/portmidi.c \
!         ../portmidi/porttime/ptmacosx_cf.c "
      STRIPFLAG=""
      GUINAME="pdtcl"
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** s_main.c	18 May 2005 04:28:51 -0000	1.11
--- s_main.c	30 May 2005 03:04:19 -0000	1.12
***************
*** 52,61 ****
  int sys_oldtclversion;      /* hack to warn g_rtext.c about old text sel */
! int sys_nmidiout = 1;
! #ifdef MSW
! int sys_nmidiin = 0;
! #else
! int sys_nmidiin = 1;
! #endif
  int sys_midiindevlist[MAXMIDIINDEV] = {1};
  int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
--- 52,57 ----
  int sys_oldtclversion;      /* hack to warn g_rtext.c about old text sel */
! int sys_nmidiout = -1;
! int sys_nmidiin = -1;
  int sys_midiindevlist[MAXMIDIINDEV] = {1};
  int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
***************
*** 922,927 ****
--- 918,925 ----
              audiooutdev[i] = sys_soundoutdevlist[i];
      }
+     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
      if (sys_nmidiin >= 0)
      {
+         post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
          nmidiindev = sys_nmidiin;
          for (i = 0; i < nmidiindev; i++)
Index: s_file.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_file.c	18 May 2005 04:28:51 -0000	1.4
--- s_file.c	30 May 2005 03:04:18 -0000	1.5
***************
*** 312,330 ****
/* load MIDI preferences */
!     for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++)
      {
          sprintf(keybuf, "midiindev%d", i+1);
          if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING))
              break;
!         if (sscanf(prefbuf, "%d %d", &midiindev[i], &chindev[i]) < 2)
              break;
          nmidiindev++;
      }
!     for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++)
      {
          sprintf(keybuf, "midioutdev%d", i+1);
          if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING))
              break;
!         if (sscanf(prefbuf, "%d %d", &midioutdev[i], &choutdev[i]) < 2)
              break;
          nmidioutdev++;
--- 312,334 ----
/* load MIDI preferences */
!     if (sys_getpreference("nomidiin", prefbuf, MAXPDSTRING))
!         nmidiindev = 0;
!     else for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++)
      {
          sprintf(keybuf, "midiindev%d", i+1);
          if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING))
              break;
!         if (sscanf(prefbuf, "%d", &midiindev[i]) < 1)
              break;
          nmidiindev++;
      }
!     if (sys_getpreference("nomidiout", prefbuf, MAXPDSTRING))
!         nmidioutdev = 0;
!     else for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++)
      {
          sprintf(keybuf, "midioutdev%d", i+1);
          if (!sys_getpreference(keybuf, prefbuf, MAXPDSTRING))
              break;
!         if (sscanf(prefbuf, "%d", &midioutdev[i]) < 1)
              break;
          nmidioutdev++;
Index: makefile.nt
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.nt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** makefile.nt	6 Sep 2004 20:20:35 -0000	1.2
--- makefile.nt	30 May 2005 03:04:18 -0000	1.3
***************
*** 17,21 ****
  GLIB =  $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib
  CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \
! 	-DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__
  LFLAGS = /nologo
--- 17,21 ----
  GLIB =  $(LIB) ..\bin\tcl84.lib ..\bin\tk84.lib
  CFLAGS = /nologo /W3 /DMSW /DNT /DPD /DPD_INTERNAL /DWIN32 /DWINDOWS /Ox \
! 	-DPA_LITTLE_ENDIAN -DUSEAPI_MMIO -DUSEAPI_PORTAUDIO -D__i386__ -DPA19
  LFLAGS = /nologo
***************
*** 40,44 ****
  PADIR = ..\portaudio
  INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio
! SRCPA = $(PADIR)/pa_common/pa_lib.c $(PADIR)/pa_common/pa_trace.c
  SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp
--- 40,55 ----
  PADIR = ..\portaudio
  INCPA = -I$(PADIR) -I$(PADIR)\pa_common -I$(PADIR)\pablio -I..\lib\asio
! SRCPA = $(PADIR)/pa_common/pa_stream.c \
!         $(PADIR)/pa_common/pa_trace.c \
!         $(PADIR)/pa_common/pa_skeleton.c \
!         $(PADIR)/pa_common/pa_process.c \
!         $(PADIR)/pa_common/pa_front.c \
!         $(PADIR)/pa_common/pa_dither.c \
!         $(PADIR)/pa_common/pa_cpuload.c \
!         $(PADIR)/pa_common/pa_converters.c \
!         $(PADIR)/pa_win/pa_win_util.c \
!         $(PADIR)/pa_win/pa_win_hostapis.c \
!         $(PADIR)/pa_common/pa_allocation.c
! 
  SRCASIO = $(PADIR)/pa_asio/pa_asio.cpp
***************
*** 48,52 ****
! PAOBJ = pa_lib.obj pa_trace.obj pa_asio.obj
--- 59,65 ----
! PAOBJ = pa_stream.obj pa_trace.obj pa_skeleton.obj pa_process.obj \
! 	pa_front.obj pa_dither.obj pa_cpuload.obj pa_converters.obj \
! 	pa_allocation.obj pa_win_util.obj pa_win_hostapis.obj pa_asio.obj
***************
*** 90,102 ****
# explicit rules to compile portaudio sources:
! pa_lib.obj: $(PADIR)\pa_common\pa_lib.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_lib.c
  pa_trace.obj: $(PADIR)\pa_common\pa_trace.c
    cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c
! pablio_pd.obj: $(PADIR)\pablio\pablio_pd.c
! 	cl /c $(ALLCF) $(PADIR)\pablio\pablio_pd.c
! ringbuffer_pd.obj: $(PADIR)\pablio\ringbuffer_pd.c
! 	cl /c $(ALLCF) $(PADIR)\pablio\ringbuffer_pd.c
pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp
    cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp
--- 103,129 ----
# explicit rules to compile portaudio sources:
! pa_stream.obj: $(PADIR)\pa_common\pa_stream.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_stream.c
  pa_trace.obj: $(PADIR)\pa_common\pa_trace.c
    cl /c $(ALLCF) $(PADIR)\pa_common\pa_trace.c
! pa_skeleton.obj: $(PADIR)\pa_common\pa_skeleton.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_skeleton.c
! pa_process.obj: $(PADIR)\pa_common\pa_process.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_process.c
! pa_front.obj: $(PADIR)\pa_common\pa_front.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_front.c
! pa_dither.obj: $(PADIR)\pa_common\pa_dither.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_dither.c
! pa_cpuload.obj: $(PADIR)\pa_common\pa_cpuload.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_cpuload.c
! pa_converters.obj: $(PADIR)\pa_common\pa_converters.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_converters.c
! pa_allocation.obj: $(PADIR)\pa_common\pa_allocation.c
! 	cl /c $(ALLCF) $(PADIR)\pa_common\pa_allocation.c
+ pa_win_util.obj: $(PADIR)\pa_win\pa_win_util.c
+ 	cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_util.c
+ pa_win_hostapis.obj: $(PADIR)\pa_win\pa_win_hostapis.c
+ 	cl /c $(ALLCF) $(PADIR)\pa_win\pa_win_hostapis.c
  pa_asio.obj: $(PADIR)\pa_asio\pa_asio.cpp
    cl /c $(ALLCF) $(PADIR)\pa_asio\pa_asio.cpp
Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** s_inter.c	18 May 2005 04:28:51 -0000	1.8
--- s_inter.c	30 May 2005 03:04:18 -0000	1.9
***************
*** 19,22 ****
--- 19,23 ----
  #include <sys/time.h>
  #include <sys/mman.h>
+ #include <sys/resource.h>
  #endif
  #ifdef HAVE_BSTRING_H
***************
*** 279,282 ****
--- 280,289 ----
#ifdef _POSIX_MEMLOCK
+     /* tb: force memlock to physical memory { */
+     struct rlimit mlock_limit;
+     mlock_limit.rlim_cur=0;
+     mlock_limit.rlim_max=0;
+     setrlimit(RLIMIT_MEMLOCK,&mlock_limit);
+     /* } tb */
      if (mlockall(MCL_FUTURE) != -1) 
          fprintf(stderr, "memory locking enabled.\n");
Index: d_fft.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** d_fft.c	6 Sep 2004 20:20:33 -0000	1.2
--- d_fft.c	30 May 2005 03:04:17 -0000	1.3
***************
*** 5,8 ****
--- 5,39 ----
  #include "m_pd.h"
+ /* ---------------- utility functions for DSP chains ---------------------- */
+ 
+     /* swap two arrays */
+ static t_int *sigfft_swap(t_int *w)
+ {
+     float *in1 = (t_float *)(w[1]);
+     float *in2 = (t_float *)(w[2]);
+     int n = w[3];
+     for (;n--; in1++, in2++)
+     {   
+         float f = *in1;
+         *in1 = *in2;
+         *in2 = f;
+     }
+     return (w+4);    
+ }
+ 
+     /* take array1 (supply a pointer to beginning) and copy it,
+     into decreasing addresses, into array 2 (supply a pointer one past the
+     end), and negate the sign. */
+ 
+ static t_int *sigrfft_flip(t_int *w)
+ {
+     float *in = (t_float *)(w[1]);
+     float *out = (t_float *)(w[2]);
+     int n = w[3];
+     while (n--)
+         *(--out) = - *in++;
+     return (w+4);
+ }
+ 
  /* ------------------------ fft~ and ifft~ -------------------------------- */
  static t_class *sigfft_class, *sigifft_class;
***************
*** 34,51 ****
  }
- static t_int *sigfft_swap(t_int *w)
- {
-     float *in1 = (t_float *)(w[1]);
-     float *in2 = (t_float *)(w[2]);
-     int n = w[3];
-     for (;n--; in1++, in2++)
-     {   
-         float f = *in1;
-         *in1 = *in2;
-         *in2 = f;
-     }
-     return (w+4);    
- }
- 
  static t_int *sigfft_perform(t_int *w)
  {
--- 65,68 ----
***************
*** 131,144 ****
  }
- static t_int *sigrfft_flip(t_int *w)
- {
-     float *in = (t_float *)(w[1]);
-     float *out = (t_float *)(w[2]);
-     int n = w[3];
-     while (n--) *(--out) = *in++;
-     *(--out) = 0;                   /* to hell with it */
-     return (w+4);
- }
- 
  static t_int *sigrfft_perform(t_int *w)
  {
--- 148,151 ----
***************
*** 160,177 ****
          return;
      }
!     if (in1 == out2)    /* this probably never happens */
!     {
!         dsp_add(sigrfft_perform, 2, out2, n);
!         dsp_add(copy_perform, 3, out2, out1, n2);
!         dsp_add(sigrfft_flip, 3, out2 + (n2+1), out2 + n2, n2-1);
!     }
!     else
!     {
!         if (in1 != out1) dsp_add(copy_perform, 3, in1, out1, n);
!         dsp_add(sigrfft_perform, 2, out1, n);
!         dsp_add(sigrfft_flip, 3, out1 + (n2+1), out2 + n2, n2-1);
!     }
!     dsp_add_zero(out1 + n2, n2);
      dsp_add_zero(out2 + n2, n2);
  }
--- 167,178 ----
          return;
      }
!     if (in1 != out1)
!         dsp_add(copy_perform, 3, in1, out1, n);
!     dsp_add(sigrfft_perform, 2, out1, n);
!     dsp_add(sigrfft_flip, 3, out1 + (n2+1), out2 + n2, n2-1);
!     dsp_add_zero(out1 + (n2+1), ((n2-1)&(~7)));
!     dsp_add_zero(out1 + (n2+1) + ((n2-1)&(~7)), ((n2-1)&7));
      dsp_add_zero(out2 + n2, n2);
+     dsp_add_zero(out2, 1);
  }
***************
*** 225,234 ****
      if (in2 == out1)
      {
!         dsp_add(sigrfft_flip, 3, out1+1, out1 + n, (n2-1));
!         dsp_add(copy_perform, 3, in1, out1, n2);
      }
      else
      {
!         if (in1 != out1) dsp_add(copy_perform, 3, in1, out1, n2);
          dsp_add(sigrfft_flip, 3, in2+1, out1 + n, n2-1);
      }
--- 226,235 ----
      if (in2 == out1)
      {
!         dsp_add(sigrfft_flip, 3, out1+1, out1 + n, n2-1);
!         dsp_add(copy_perform, 3, in1, out1, n2+1);
      }
      else
      {
!         if (in1 != out1) dsp_add(copy_perform, 3, in1, out1, n2+1);
          dsp_add(sigrfft_flip, 3, in2+1, out1 + n, n2-1);
      }
Index: makefile
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** makefile	18 May 2005 04:28:51 -0000	1.11
--- makefile	30 May 2005 03:04:18 -0000	1.12
***************
*** 11,19 ****
  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.
  GINCLUDE = $(INCLUDE) 
! GLIB = -ltk8.4 -ltcl8.4  -lX11 -L/usr/X11R6/lib -lrt
LDFLAGS = -Wl,-export-dynamic -lasound
--- 11,19 ----
  MANDIR = ${prefix}/man
! MORECFLAGS = -DUSEAPI_PORTAUDIO -DPA19 -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD    	 -DUSEAPI_OSS         -I../portaudio/pa_common -I../portaudio/pablio         -I../portmidi/pm_common         -I../portmidi/pm_linux 	-fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA -Wno-error
INCLUDE = -I.
  GINCLUDE = $(INCLUDE) 
! GLIB = -ltk8.4 -ltcl8.4  -lX11 -L/usr/X11R6/lib
LDFLAGS = -Wl,-export-dynamic -lasound
***************
*** 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_audio_pa.c     	s_audio_pablio.c     	s_audio_paring.c     	../portaudio/pa_common/pa_allocation.c  	../portaudio/pa_common/pa_converters.c  	../portaudio/pa_common/pa_cpuload.c     	../portaudio/pa_common/pa_dither.c      	../portaudio/pa_common/pa_front.c       	../portaudio/pa_common/pa_process.c     	../portaudio/pa_common/pa_skeleton.c    	../portaudio/pa_common/pa_stream.c      	../portaudio/pa_common/pa_trace.c       	../portaudio/pa_unix/pa_unix_hostapis.c 	../portaudio/pa_unix/pa_unix_util.c     	../portaudio/pa_unix_oss/pa_unix_oss.c s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c ../portaudio/pa_linux_alsa/pa_linux_alsa.c
SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
Index: s_midi_pm.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** s_midi_pm.c	6 Sep 2004 20:20:36 -0000	1.4
--- s_midi_pm.c	30 May 2005 03:04:19 -0000	1.5
***************
*** 61,65 ****
                  {
                      err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev],
!                         j, NULL, 100, NULL, NULL, NULL);
                      if (err)
                          post("could not open midi input %d (%s): %s",
--- 61,65 ----
                  {
                      err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev],
!                         j, NULL, 100, NULL, NULL);
                      if (err)
                          post("could not open midi input %d (%s): %s",
***************
*** 259,277 ****
  }
- #if 0
- void sys_listmididevs(void)     /* lifted from pa_devs.c in portaudio */
- {
-     int i,j;
-     for (i = 0; i < Pm_CountDevices(); i++)
-     {
-         const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
-         printf("%d: %s, %s", i, info->interf, info->name);
-         if (info->input) printf(" (input)");
-         if (info->output) printf(" (output)");
-         printf("\n");
-     }
- }
- #endif
- 
  void midi_getdevs(char *indevlist, int *nindevs,
      char *outdevlist, int *noutdevs, int maxndev, int devdescsize)
--- 259,262 ----
Index: notes.txt
===================================================================
RCS file: /cvsroot/pure-data/pd/src/notes.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** notes.txt	18 May 2005 04:28:51 -0000	1.10
--- notes.txt	30 May 2005 03:04:18 -0000	1.11
***************
*** 4,7 ****
--- 4,11 ----
  array elements can be clicked on, etc
  fixed array onset bug
+ rfft bug fix
+ 
+ check:
+ MIDI I/O for windows
At the source level, "regular" arrays and arrays withing data structures
***************
*** 24,27 ****
--- 28,33 ----
problems:
+ 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?
Index: g_array.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_array.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** g_array.c	18 May 2005 04:28:50 -0000	1.5
--- g_array.c	30 May 2005 03:04:17 -0000	1.6
***************
*** 81,84 ****
--- 81,85 ----
          char *cp = x->a_vec + elemsize * oldn;
          int i = n - oldn;
+         post("%d->%d", oldn, i);
          for (; i--; cp += elemsize)
          {
***************
*** 469,473 ****
      {
          yval = *(float *)(a->a_vec +
!                elemsize * i * sizeof (t_word) + yonset);
          sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n",
                   x->x_realname->s_name,
--- 470,474 ----
      {
          yval = *(float *)(a->a_vec +
!                elemsize * i + yonset);
          sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n",
                   x->x_realname->s_name,
***************
*** 513,517 ****
      {
          yval = *(float *)(a->a_vec + \
!                elemsize * i * sizeof (t_word) + yonset);
          sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n",
                   x->x_realname->s_name,
--- 514,518 ----
      {
          yval = *(float *)(a->a_vec + \
!                elemsize * i + yonset);
          sys_vgui(".%sArrayWindow.lb insert %d {%d) %g}\n",
                   x->x_realname->s_name,
Index: x_net.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_net.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** x_net.c	6 Sep 2004 20:20:36 -0000	1.2
--- x_net.c	30 May 2005 03:04:19 -0000	1.3
***************
*** 82,86 ****
          intarg = 1;
          if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
!             &intarg, sizeof(intarg)) < 0)
                  post("setsockopt (TCP_NODELAY) failed\n");
      }
--- 82,86 ----
          intarg = 1;
          if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
!             (char *)&intarg, sizeof(intarg)) < 0)
                  post("setsockopt (TCP_NODELAY) failed\n");
      }
***************
*** 274,278 ****
      intarg = 1;
      if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
!         &intarg, sizeof(intarg)) < 0)
              post("setsockopt (SO_REUSEADDR) failed\n");
  #endif
--- 274,278 ----
      intarg = 1;
      if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
!         (char *)&intarg, sizeof(intarg)) < 0)
              post("setsockopt (SO_REUSEADDR) failed\n");
  #endif
***************
*** 288,292 ****
          intarg = 1;
          if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
!             &intarg, sizeof(intarg)) < 0)
                  post("setsockopt (TCP_NODELAY) failed\n");
      }
--- 288,292 ----
          intarg = 1;
          if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY,
!             (char *)&intarg, sizeof(intarg)) < 0)
                  post("setsockopt (TCP_NODELAY) failed\n");
      }
Index: makefile.dependencies
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.dependencies,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile.dependencies	18 May 2005 04:28:51 -0000	1.3
--- makefile.dependencies	30 May 2005 03:04:18 -0000	1.4
***************
*** 0 ****
--- 1,1296 ----
+ g_canvas.o: g_canvas.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 \
+   /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 \
[...1267 lines suppressed...]
+   /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/include/syslimits.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/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/pthread.h /usr/include/sched.h /usr/include/signal.h \
+   /usr/include/bits/initspin.h /usr/include/bits/sigthread.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/sys/mman.h /usr/include/bits/mman.h \
+   ../portaudio/pa_common/portaudio.h ../portaudio/pa_common/pa_util.h \
+   ../portaudio/pa_unix/pa_unix_util.h ../portaudio/pa_common/pa_cpuload.h \
+   ../portaudio/pa_common/pa_allocation.h \
+   ../portaudio/pa_common/pa_hostapi.h ../portaudio/pa_common/pa_stream.h \
+   ../portaudio/pa_common/pa_process.h \
+   ../portaudio/pa_common/pa_converters.h \
+   ../portaudio/pa_common/pa_dither.h \
+   ../portaudio/pa_linux_alsa/pa_linux_alsa.h
Index: d_soundfile.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** d_soundfile.c	6 Sep 2004 20:20:33 -0000	1.4
--- d_soundfile.c	30 May 2005 03:04:17 -0000	1.5
***************
*** 31,35 ****
typedef unsigned short uint16;
! typedef unsigned long uint32;
#define FORMAT_WAVE 0
--- 31,35 ----
typedef unsigned short uint16;
! typedef unsigned int uint32;
#define FORMAT_WAVE 0
Index: x_connective.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** x_connective.c	6 Nov 2004 16:07:34 -0000	1.4
--- x_connective.c	30 May 2005 03:04:19 -0000	1.5
***************
*** 972,993 ****
      t_triggerout *u;
      int i;
-     t_atom at;
-     if (!argc)
-     {
-         argc = 1;
-         SETFLOAT(&at, 0);
-         argv = &at;
-     }
      for (i = x->x_n, u = x->x_vec + i; u--, i--;)
      {
          if (u->u_type == TR_FLOAT)
!             outlet_float(u->u_outlet, atom_getfloat(argv));
          else if (u->u_type == TR_BANG)
              outlet_bang(u->u_outlet);
          else if (u->u_type == TR_SYMBOL)
!             outlet_symbol(u->u_outlet, atom_getsymbol(argv));
          else if (u->u_type == TR_POINTER)
          {
!             if (argv->a_type != TR_POINTER)
                  pd_error(x, "unpack: bad pointer");
              else outlet_pointer(u->u_outlet, argv->a_w.w_gpointer);
--- 972,986 ----
      t_triggerout *u;
      int i;
      for (i = x->x_n, u = x->x_vec + i; u--, i--;)
      {
          if (u->u_type == TR_FLOAT)
!             outlet_float(u->u_outlet, (argc ? atom_getfloat(argv) : 0));
          else if (u->u_type == TR_BANG)
              outlet_bang(u->u_outlet);
          else if (u->u_type == TR_SYMBOL)
!             outlet_symbol(u->u_outlet, (argc ? atom_getsymbol(argv) : 0));
          else if (u->u_type == TR_POINTER)
          {
!             if (!argc || argv->a_type != TR_POINTER)
                  pd_error(x, "unpack: bad pointer");
              else outlet_pointer(u->u_outlet, argv->a_w.w_gpointer);
Index: g_template.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_template.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** g_template.c	18 May 2005 04:28:51 -0000	1.6
--- g_template.c	30 May 2005 03:04:18 -0000	1.7
***************
*** 483,486 ****
--- 483,501 ----
  }
+ #if 0
+     /* bash the first of (argv) with a pointer to a scalar, and send on
+     to template as a notification message */
+ static void template_notifyforscalar(t_template *template, t_glist *owner,
+     t_scalar *sc, t_symbol *s, int argc, t_atom *argv)
+ {
+     t_gpointer gp;
+     gpointer_init(&gp);
+     gpointer_setglist(&gp, owner, x);
+     SETPOINTER(argv, &gp);
+     template_notify(template, s, argc, argv);
+     gpointer_unset(&gp);
+ }
+ #endif
+ 
      /* call this when reading a patch from a file to declare what templates
      we'll need.  If there's already a template, check if it matches.
***************
*** 1900,1903 ****
--- 1915,1921 ----
      t_drawnumber *x = (t_drawnumber *)z;
      t_atom at;
+         int xloc, yloc, font, fontwidth, fontheight;
+     char buf[DRAWNUMBER_BUFSIZE];
+ 
      if (!x->x_vis)
      {
***************
*** 1906,1916 ****
          return;
      }
!     int xloc = glist_xtopixels(glist,
          basex + fielddesc_getfloat(&x->x_xloc, template, data, 0));
!     int yloc = glist_ytopixels(glist,
          basey + fielddesc_getfloat(&x->x_yloc, template, data, 0));
!     int font = glist_getfont(glist);
!     int fontwidth = sys_fontwidth(font), fontheight = sys_fontheight(font);
!     char buf[DRAWNUMBER_BUFSIZE];
      if (x->x_flags & DRAW_SYMBOL)
          SETSYMBOL(&at, fielddesc_getsymbol(&x->x_value, template, data, 0));
--- 1924,1934 ----
          return;
      }
!     xloc = glist_xtopixels(glist,
          basex + fielddesc_getfloat(&x->x_xloc, template, data, 0));
!     yloc = glist_ytopixels(glist,
          basey + fielddesc_getfloat(&x->x_yloc, template, data, 0));
!     font = glist_getfont(glist);
!     fontwidth = sys_fontwidth(font);
!         fontheight = sys_fontheight(font);
      if (x->x_flags & DRAW_SYMBOL)
          SETSYMBOL(&at, fielddesc_getsymbol(&x->x_value, template, data, 0));