CVS: rdesktop rdpsnd_libao.c,1.19,1.20

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32669

Modified Files:
	rdpsnd_libao.c 
Log Message:
make it possible to select libao output driver


Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** rdpsnd_libao.c	17 Sep 2006 15:25:10 -0000	1.19
--- rdpsnd_libao.c	18 Sep 2006 09:27:58 -0000	1.20
***************
*** 44,57 ****
  {
  	ao_sample_format format;
- 	static int warned = 0;
  
! 	if (!warned && libao_device)
  	{
! 		warning("device-options not supported for libao-driver\n");
! 		warned = 1;
  	}
- 
- 	ao_initialize();
- 	default_driver = ao_default_driver_id();
  
  	format.bits = 16;
--- 44,58 ----
  {
  	ao_sample_format format;
  
! 	ao_initialize();
! 
! 	if (libao_device)
  	{
! 		default_driver = ao_driver_id(libao_device);
! 	}
! 	else
! 	{
! 		default_driver = ao_default_driver_id();
  	}
  
  	format.bits = 16;
***************
*** 234,237 ****
--- 235,239 ----
  {
  	static struct audio_driver libao_driver;
+ 	static char description[101];
  
  	libao_driver.wave_out_write = rdpsnd_queue_write;
***************
*** 243,250 ****
  	libao_driver.wave_out_play = libao_play;
  	libao_driver.name = xstrdup("libao");
! 	libao_driver.description = xstrdup("libao output driver");
  	libao_driver.need_byteswap_on_be = 0;
  	libao_driver.next = NULL;
  
  	if (options)
  	{
--- 245,256 ----
  	libao_driver.wave_out_play = libao_play;
  	libao_driver.name = xstrdup("libao");
! 	libao_driver.description = description;
  	libao_driver.need_byteswap_on_be = 0;
  	libao_driver.next = NULL;
  
+ 	ao_initialize();
+ 	snprintf(description, 100, "libao output driver, default device: %s", ao_driver_info(ao_default_driver_id())->short_name);
+ 	ao_shutdown();
+ 
  	if (options)
  	{


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642