CVS: rdesktop rdpsnd_libao.c,1.21,1.22

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

Modified Files:
	rdpsnd_libao.c 
Log Message:
do not segfault when no libao default-driver is defined


Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** rdpsnd_libao.c	18 Sep 2006 09:28:42 -0000	1.21
--- rdpsnd_libao.c	18 Sep 2006 09:34:34 -0000	1.22
***************
*** 235,238 ****
--- 235,239 ----
  {
  	static struct audio_driver libao_driver;
+ 	struct ao_info *libao_info;
  	static char description[101];
  
***************
*** 250,255 ****
  
  	ao_initialize();
! 	snprintf(description, 100, "libao output driver, default device: %s",
! 		 ao_driver_info(ao_default_driver_id())->short_name);
  	ao_shutdown();
  
--- 251,267 ----
  
  	ao_initialize();
! 
! 	libao_info = ao_driver_info(ao_default_driver_id());
! 
! 	if (libao_info)
! 	{
! 		snprintf(description, 100, "libao output driver, default device: %s",
! 				libao_info->short_name);
! 	}
! 	else
! 	{
! 		snprintf(description, 100, "libao output driver, default device: none");
! 	}
! 
  	ao_shutdown();
  


-------------------------------------------------------------------------
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