CVS: rdesktop rdpsnd.h, 1.5, 1.6 rdpsnd_alsa.c, 1.6, 1.7 rdpsnd_dsp.c, 1.10, 1.11 rdpsnd_libao.c, 1.23, 1.24 rdpsnd_oss.c, 1.26, 1.27 rdpsnd_sgi.c, 1.13, 1.14 rdpsnd_sun.c, 1.20, 1.21

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

Modified Files:
	rdpsnd.h rdpsnd_alsa.c rdpsnd_dsp.c rdpsnd_libao.c 
	rdpsnd_oss.c rdpsnd_sgi.c rdpsnd_sun.c 
Log Message:
make it possible for the driver to switch resampling on and off
dynamically. this will be needed for the OSS driver.


Index: rdpsnd.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rdpsnd.h	17 Sep 2006 15:25:10 -0000	1.5
--- rdpsnd.h	1 Oct 2006 14:03:43 -0000	1.6
***************
*** 38,41 ****
--- 38,42 ----
  	char *description;
  	int need_byteswap_on_be;
+ 	int need_resampling;
  	struct audio_driver *next;
  };

Index: rdpsnd_alsa.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_alsa.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rdpsnd_alsa.c	17 Sep 2006 15:33:29 -0000	1.6
--- rdpsnd_alsa.c	1 Oct 2006 14:03:43 -0000	1.7
***************
*** 288,291 ****
--- 288,292 ----
  	alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE);
  	alsa_driver.need_byteswap_on_be = 0;
+ 	alsa_driver.need_resampling = 0;
  	alsa_driver.next = NULL;
  

Index: rdpsnd_dsp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_dsp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rdpsnd_dsp.c	1 Oct 2006 13:57:34 -0000	1.10
--- rdpsnd_dsp.c	1 Oct 2006 14:03:43 -0000	1.11
***************
*** 311,315 ****
  	out.data = NULL;
  
! 	if (current_driver->wave_out_format_supported == rdpsnd_dsp_resample_supported)
  		out.size = rdpsnd_dsp_resample(&out.data, s->data, s->size, format, stream_be);
  
--- 311,315 ----
  	out.data = NULL;
  
! 	if (current_driver->need_resampling)
  		out.size = rdpsnd_dsp_resample(&out.data, s->data, s->size, format, stream_be);
  

Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** rdpsnd_libao.c	1 Oct 2006 12:16:50 -0000	1.23
--- rdpsnd_libao.c	1 Oct 2006 14:03:43 -0000	1.24
***************
*** 196,199 ****
--- 196,200 ----
  	libao_driver.description = description;
  	libao_driver.need_byteswap_on_be = 0;
+ 	libao_driver.need_resampling = 1;
  	libao_driver.next = NULL;
  

Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rdpsnd_oss.c	1 Oct 2006 11:08:09 -0000	1.26
--- rdpsnd_oss.c	1 Oct 2006 14:03:43 -0000	1.27
***************
*** 251,254 ****
--- 251,255 ----
  		xstrdup("OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
  	oss_driver.need_byteswap_on_be = 0;
+ 	oss_driver.need_resampling = 0;
  	oss_driver.next = NULL;
  

Index: rdpsnd_sgi.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sgi.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rdpsnd_sgi.c	17 Sep 2006 15:25:10 -0000	1.13
--- rdpsnd_sgi.c	1 Oct 2006 14:03:43 -0000	1.14
***************
*** 298,301 ****
--- 298,302 ----
  	sgi_driver.description = xstrdup("SGI output driver");
  	sgi_driver.need_byteswap_on_be = 1;
+ 	sgi_driver.need_resampling = 0;
  	sgi_driver.next = NULL;
  

Index: rdpsnd_sun.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sun.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** rdpsnd_sun.c	17 Sep 2006 15:25:10 -0000	1.20
--- rdpsnd_sun.c	1 Oct 2006 14:03:43 -0000	1.21
***************
*** 265,268 ****
--- 265,269 ----
  		xstrdup("SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
  	sun_driver.need_byteswap_on_be = 1;
+ 	sun_driver.need_resampling = 0;
  	sun_driver.next = NULL;
  


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