[PD-cvs] pd/src s_audio.c, 1.5.4.16.2.16, 1.5.4.16.2.17 s_stuff.h, 1.5.4.10.2.6, 1.5.4.10.2.7 s_audio_portaudio.c, 1.1.2.1, 1.1.2.2

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_39
	s_audio.c s_stuff.h s_audio_portaudio.c 
Log Message:
index fixes

Index: s_audio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v
retrieving revision 1.5.4.16.2.16
retrieving revision 1.5.4.16.2.17
diff -C2 -d -r1.5.4.16.2.16 -r1.5.4.16.2.17
*** s_audio.c	20 Apr 2006 15:34:15 -0000	1.5.4.16.2.16
--- s_audio.c	21 Apr 2006 14:03:17 -0000	1.5.4.16.2.17
***************
*** 30,34 ****
  #define DEVDESCSIZE 80
   
! EXTERN void audio_getdevs(char *indevlist, int *nindevs,
  	char *outdevlist, int *noutdevs, int *canmulti, 
  	int maxndev, int devdescsize);
--- 30,34 ----
  #define DEVDESCSIZE 80
   
! static void audio_getdevs(char *indevlist, int *nindevs,
  	char *outdevlist, int *noutdevs, int *canmulti, 
  	int maxndev, int devdescsize);
***************
*** 592,596 ****
  
  
! /*static*/ void audio_getdevs(char *indevlist, int *nindevs,
      char *outdevlist, int *noutdevs, int *canmulti, 
          int maxndev, int devdescsize)
--- 592,596 ----
  
  
! static void audio_getdevs(char *indevlist, int *nindevs,
      char *outdevlist, int *noutdevs, int *canmulti, 
          int maxndev, int devdescsize)

Index: s_audio_portaudio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** s_audio_portaudio.c	20 Apr 2006 13:32:33 -0000	1.1.2.1
--- s_audio_portaudio.c	21 Apr 2006 14:03:20 -0000	1.1.2.2
***************
*** 112,130 ****
      if (inchans > 0)
      {
!         for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++)
          {
!             const PaDeviceInfo *info = Pa_GetDeviceInfo(j);
!             int maxchans = info->maxInputChannels;
!             if (maxchans > 0)
!             {
!                 if (devno == indeviceno)
!                 {
!                     if (maxchans < inchans)
!                         inchans = maxchans;
!                     pa_indev = j;
!                     break;
!                 }
!                 devno++;
!             }
          }
      }
--- 112,120 ----
      if (inchans > 0)
      {
!         const PaDeviceInfo *info = Pa_GetDeviceInfo(indeviceno);
!         int maxchans = info->maxOutputChannels;
!         if (maxchans > 0)
          {
!             pa_indev = indeviceno;
          }
      }
***************
*** 132,150 ****
      if (outchans > 0)
      {
!         for (j = 0, devno = 0; j < Pa_GetDeviceCount(); j++)
          {
!             const PaDeviceInfo *info = Pa_GetDeviceInfo(j);
!             int maxchans = info->maxOutputChannels;
!             if (maxchans > 0)
!             {
!                 if (devno == outdeviceno)
!                 {
!                     if (maxchans < outchans)
!                         outchans = maxchans;
!                     pa_outdev = j;
!                     break;
!                 }
!                 devno++;
!             }
          }
      }
--- 122,130 ----
      if (outchans > 0)
      {
!         const PaDeviceInfo *info = Pa_GetDeviceInfo(outdeviceno);
!         int maxchans = info->maxOutputChannels;
!         if (maxchans > 0)
          {
!             pa_outdev = outdeviceno;
          }
      }
***************
*** 452,456 ****
      {
          const PaDeviceInfo *pdi = Pa_GetDeviceInfo(i);
!         if (pdi->maxInputChannels > 0 && nin < maxndev)
          {
              PaHostApiIndex api = pdi->hostApi;
--- 432,436 ----
      {
          const PaDeviceInfo *pdi = Pa_GetDeviceInfo(i);
!         if (nin < maxndev)
          {
              PaHostApiIndex api = pdi->hostApi;
***************
*** 463,467 ****
              nin++;
          }
!         if (pdi->maxOutputChannels > 0 && nout < maxndev)
          {
              PaHostApiIndex api = pdi->hostApi;
--- 443,447 ----
              nin++;
          }
!         if (nout < maxndev)
          {
              PaHostApiIndex api = pdi->hostApi;

Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
retrieving revision 1.5.4.10.2.6
retrieving revision 1.5.4.10.2.7
diff -C2 -d -r1.5.4.10.2.6 -r1.5.4.10.2.7
*** s_stuff.h	14 Apr 2006 18:35:44 -0000	1.5.4.10.2.6
--- s_stuff.h	21 Apr 2006 14:03:20 -0000	1.5.4.10.2.7
***************
*** 263,266 ****
--- 263,277 ----
          int maxndev, int devdescsize);
  
+ /* tb { */
+ void pa_test_setting (int ac, t_atom *av);
+ void pa_getcurrent_devices(void);
+ void pa_getaudiooutdevinfo(t_float f);
+ void pa_getaudioindevinfo(t_float f);
+ /* } tb */
+ 
+ 
+ 
+ 
+ 
  int oss_open_audio(int naudioindev, int *audioindev, int nchindev,
      int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev,