CVS: rdesktop rdpsnd_dsp.c,1.1,1.2

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

Modified Files:
	rdpsnd_dsp.c 
Log Message:
softvol only needs one buffer


Index: rdpsnd_dsp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_dsp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rdpsnd_dsp.c	17 Sep 2006 14:41:16 -0000	1.1
--- rdpsnd_dsp.c	17 Sep 2006 15:08:48 -0000	1.2
***************
*** 37,46 ****
  
  inline void
! rdpsnd_dsp_softvol(unsigned char *inbuffer, unsigned char *outbuffer, unsigned int size,
! 		   WAVEFORMATEX * format)
  {
  	unsigned int factor_left, factor_right;
! 	unsigned char *posin = inbuffer;
! 	unsigned char *posout = outbuffer;
  
  	factor_left = (softvol_left * 256) / 65535;
--- 37,48 ----
  
  inline void
! rdpsnd_dsp_softvol(unsigned char *buffer, unsigned int size, WAVEFORMATEX * format)
  {
  	unsigned int factor_left, factor_right;
! 	unsigned char *posin = buffer;
! 	unsigned char *posout = buffer;
! 
! 	if ((softvol_left == MAX_VOLUME) && (softvol_right == MAX_VOLUME))
! 		return;
  
  	factor_left = (softvol_left * 256) / 65535;
***************
*** 56,60 ****
  		char val;
  
! 		while (posout < outbuffer + size)
  		{
  			/* Left */
--- 58,62 ----
  		char val;
  
! 		while (posout < buffer + size)
  		{
  			/* Left */
***************
*** 73,77 ****
  		short val;
  
! 		while (posout < outbuffer + size)
  		{
  			/* Left */
--- 75,79 ----
  		short val;
  
! 		while (posout < buffer + size)
  		{
  			/* Left */
***************
*** 103,114 ****
  	outbuffer = xmalloc(size);
  
  	/* Software volume control */
  	if (current_driver->wave_out_volume == rdpsnd_dsp_softvol_set)
  	{
! 		rdpsnd_dsp_softvol(inbuffer, outbuffer, size, format);
! 	}
! 	else
! 	{
! 		memcpy(outbuffer, inbuffer, size);
  	}
  
--- 105,114 ----
  	outbuffer = xmalloc(size);
  
+ 	memcpy(outbuffer, inbuffer, size);
+ 
  	/* Software volume control */
  	if (current_driver->wave_out_volume == rdpsnd_dsp_softvol_set)
  	{
! 		rdpsnd_dsp_softvol(outbuffer, size, format);
  	}
  


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