CVS: rdesktop rdpsnd_alsa.c,1.5,1.6

Michael Gernoth <[email protected]> Sun, 17 Sep 2006 08:33:31 -0700
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11656

Modified Files:
	rdpsnd_alsa.c 
Log Message:
use software volume for ALSA


Index: rdpsnd_alsa.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_alsa.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rdpsnd_alsa.c	17 Sep 2006 15:25:10 -0000	1.5
--- rdpsnd_alsa.c	17 Sep 2006 15:33:29 -0000	1.6
***************
*** 23,26 ****
--- 23,27 ----
  #include "rdesktop.h"
  #include "rdpsnd.h"
+ #include "rdpsnd_dsp.h"
  #include <unistd.h>
  #include <fcntl.h>
***************
*** 208,223 ****
  
  void
- alsa_volume(uint16 left, uint16 right)
- {
- 	static int warned = 0;
- 
- 	if (!warned)
- 	{
- 		warning("volume changes currently not supported with alsa-output\n");
- 		warned = 1;
- 	}
- }
- 
- void
  alsa_play(void)
  {
--- 209,212 ----
***************
*** 294,298 ****
  	alsa_driver.wave_out_format_supported = alsa_format_supported;
  	alsa_driver.wave_out_set_format = alsa_set_format;
! 	alsa_driver.wave_out_volume = alsa_volume;
  	alsa_driver.wave_out_play = alsa_play;
  	alsa_driver.name = xstrdup("alsa");
--- 283,287 ----
  	alsa_driver.wave_out_format_supported = alsa_format_supported;
  	alsa_driver.wave_out_set_format = alsa_set_format;
! 	alsa_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
  	alsa_driver.wave_out_play = alsa_play;
  	alsa_driver.name = xstrdup("alsa");


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