[PD-cvs] pd/src s_audio.c,1.5.4.16.2.4,1.5.4.16.2.5

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_39
	s_audio.c 
Log Message:
small peakmeters fix
exposing audio_getdevs to the api
improving setapi handling


Index: s_audio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v
retrieving revision 1.5.4.16.2.4
retrieving revision 1.5.4.16.2.5
diff -C2 -d -r1.5.4.16.2.4 -r1.5.4.16.2.5
*** s_audio.c	30 Nov 2005 13:36:58 -0000	1.5.4.16.2.4
--- s_audio.c	16 Dec 2005 21:22:19 -0000	1.5.4.16.2.5
***************
*** 502,509 ****
  void sys_peakmeters(void)
  {
! 	sys_inmax = peak_fp(sys_soundin,sys_inchannels * sys_dacblocksize, 
! 						sys_inmax);
! 	sys_outmax = peak_fp(sys_soundout,sys_outchannels * sys_dacblocksize, 
! 						 sys_outmax);
  }
  
--- 502,511 ----
  void sys_peakmeters(void)
  {
!     if (sys_inchannels)
!         sys_inmax = peak_fp(sys_soundin,sys_inchannels * sys_dacblocksize, 
!             sys_inmax);
!     if (sys_outchannels)
!         sys_outmax = peak_fp(sys_soundout,sys_outchannels * sys_dacblocksize, 
!             sys_outmax);
  }
  
***************
*** 587,592 ****
  }
  
  /* tb: removed static flag */
! void audio_getdevs(char *indevlist, int *nindevs,
      char *outdevlist, int *noutdevs, int *canmulti, 
          int maxndev, int devdescsize)
--- 589,597 ----
  }
  
+ #define MAXNDEV 20
+ #define DEVDESCSIZE 80
+ 
  /* tb: removed static flag */
! EXTERN void audio_getdevs(char *indevlist, int *nindevs,
      char *outdevlist, int *noutdevs, int *canmulti, 
          int maxndev, int devdescsize)
***************
*** 891,895 ****
  {
      int newapi = f;
!     if (newapi)
      {
  		if (newapi != sys_audioapi)
--- 896,900 ----
  {
      int newapi = f;
!     if (newapi != sys_audioapi)
      {
  		if (newapi != sys_audioapi)
***************
*** 905,914 ****
  		glob_audio_properties(0, 0);
      }
!     else if (audio_isopen())
!     {
!         sys_close_audio();
!         audio_state = 0;
!         sched_set_using_dacs(0);
!     }
  }
  
--- 910,919 ----
  		glob_audio_properties(0, 0);
      }
! /*     else if (audio_isopen()) */
! /*     { */
! /*         sys_close_audio(); */
! /*         audio_state = 0; */
! /*         sched_set_using_dacs(0); */
! /*     } */
  }
  
***************
*** 1032,1035 ****
--- 1037,1048 ----
  }
  
+ 
+ void glob_audio_api(t_pd * dummy, t_float f)
+ {
+ 	int newapi = (int)f;
+ 	sys_close_audio();
+ 	sys_audioapi = newapi;
+ }
+ 
  void glob_audio_delay(t_pd * dummy, t_float f)
  {
***************
*** 1229,1230 ****
--- 1242,1244 ----
  
  /* tb } */
+