CVS: rdesktop rdpsnd_libao.c,1.31,1.32

Michael Gernoth <[email protected]> Sun, 24 Dec 2006 05:53:25 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2776

Modified Files:
	rdpsnd_libao.c 
Log Message:
Make code compile with C89 compilers again


Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** rdpsnd_libao.c	7 Dec 2006 15:23:45 -0000	1.31
--- rdpsnd_libao.c	24 Dec 2006 13:53:23 -0000	1.32
***************
*** 188,211 ****
  }
  
! static struct audio_driver libao_driver = {
! 	.name = "libao",
! 	.description = "libao output driver, default device: system dependent",
  
! 	.add_fds = libao_add_fds,
! 	.check_fds = libao_check_fds,
  
! 	.wave_out_open = libao_open,
! 	.wave_out_close = libao_close,
! 	.wave_out_format_supported = rdpsnd_dsp_resample_supported,
! 	.wave_out_set_format = libao_set_format,
! 	.wave_out_volume = rdpsnd_dsp_softvol_set,
  
! 	.need_byteswap_on_be = 1,
! 	.need_resampling = 1,
! };
  
- struct audio_driver *
- libao_register(char *options)
- {
  	if (options)
  	{
--- 188,211 ----
  }
  
! struct audio_driver *
! libao_register(char *options)
! {
! 	static struct audio_driver libao_driver;
  
! 	libao_driver.name = xstrdup("libao");
! 	libao_driver.description = xstrdup("libao output driver, default device: system dependent");
  
! 	libao_driver.add_fds = libao_add_fds;
! 	libao_driver.check_fds = libao_check_fds;
  
! 	libao_driver.wave_out_open = libao_open;
! 	libao_driver.wave_out_close = libao_close;
! 	libao_driver.wave_out_format_supported = rdpsnd_dsp_resample_supported;
! 	libao_driver.wave_out_set_format = libao_set_format;
! 	libao_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
! 
! 	libao_driver.need_byteswap_on_be = 1;
! 	libao_driver.need_resampling = 1;
  
  	if (options)
  	{


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV