CVS: rdesktop rdpsnd_libao.c,1.28,1.29

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

Modified Files:
	rdpsnd_libao.c 
Log Message:
sometimes libao corrupts memory, so don't call ao_initialize and ao_shutdown
when it's not really needed


Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** rdpsnd_libao.c	26 Oct 2006 09:47:17 -0000	1.28
--- rdpsnd_libao.c	7 Nov 2006 16:48:48 -0000	1.29
***************
*** 180,185 ****
  {
  	static struct audio_driver libao_driver;
- 	struct ao_info *libao_info;
- 	static char description[101];
  
  	libao_driver.wave_out_open = libao_open;
--- 180,183 ----
***************
*** 190,214 ****
  	libao_driver.wave_out_play = libao_play;
  	libao_driver.name = xstrdup("libao");
! 	libao_driver.description = description;
  	libao_driver.need_byteswap_on_be = 1;
  	libao_driver.need_resampling = 1;
  	libao_driver.next = NULL;
  
- 	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();
- 
  	if (options)
  	{
--- 188,196 ----
  	libao_driver.wave_out_play = libao_play;
  	libao_driver.name = xstrdup("libao");
! 	libao_driver.description = xstrdup("libao output driver, default device: system dependent");
  	libao_driver.need_byteswap_on_be = 1;
  	libao_driver.need_resampling = 1;
  	libao_driver.next = NULL;
  
  	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