[PD-cvs] pd/src s_audio_alsa.c,1.5.4.4,1.5.4.5 s_main.c,1.7.4.11,1.7.4.12

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_38
	s_audio_alsa.c s_main.c 
Log Message:
merging miller's changes from 0.38-3 to 0.38-4

Index: s_audio_alsa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_alsa.c,v
retrieving revision 1.5.4.4
retrieving revision 1.5.4.5
diff -C2 -d -r1.5.4.4 -r1.5.4.5
*** s_audio_alsa.c	21 Feb 2005 09:19:59 -0000	1.5.4.4
--- s_audio_alsa.c	23 Feb 2005 22:28:26 -0000	1.5.4.5
***************
*** 73,83 ****
        return (0);
      }
- 
      err1 = snd_pcm_hw_params_set_access(dev->a_handle,
-         hw_params, SND_PCM_ACCESS_MMAP_NONINTERLEAVED);
-     err2 = snd_pcm_hw_params_set_access(dev->a_handle,
          hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
      post("err 1 %d (%s), err2 %d (%s)", err1, snd_strerror(err1),
           err2, snd_strerror(err2));
      return ((err1 < 0) && (err2 >= 0));
  }
--- 73,88 ----
        return (0);
      }
      err1 = snd_pcm_hw_params_set_access(dev->a_handle,
          hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
+     if (err1 < 0)
+     {
+         err2 = snd_pcm_hw_params_set_access(dev->a_handle,
+             hw_params, SND_PCM_ACCESS_MMAP_NONINTERLEAVED);
+     }
+     else err2 = -1;
+ #if 0
      post("err 1 %d (%s), err2 %d (%s)", err1, snd_strerror(err1),
           err2, snd_strerror(err2));
+ #endif
      return ((err1 < 0) && (err2 >= 0));
  }

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.11
retrieving revision 1.7.4.12
diff -C2 -d -r1.7.4.11 -r1.7.4.12
*** s_main.c	21 Feb 2005 09:19:59 -0000	1.7.4.11
--- s_main.c	23 Feb 2005 22:28:36 -0000	1.7.4.12
***************
*** 8,12 ****
   */
  
! char pd_version[] = "Pd version 0.38.3 devel\n";
  char pd_compiletime[] = __TIME__;
  char pd_compiledate[] = __DATE__;
--- 8,12 ----
   */
  
! char pd_version[] = "Pd version 0.38.4 devel\n";
  char pd_compiletime[] = __TIME__;
  char pd_compiledate[] = __DATE__;