CVS: rdesktop rdpsnd_sun.c,1.33,1.34

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

Modified Files:
	rdpsnd_sun.c 
Log Message:
Properly store the current device settings for full duplex operation.


Index: rdpsnd_sun.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sun.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** rdpsnd_sun.c	8 Feb 2008 10:36:28 -0000	1.33
--- rdpsnd_sun.c	8 Feb 2008 10:40:56 -0000	1.34
***************
*** 308,318 ****
  
  	if (pwfx->wBitsPerSample == 8)
! 	{
! 		info.play.encoding = AUDIO_ENCODING_LINEAR8;
! 	}
  	else if (pwfx->wBitsPerSample == 16)
! 	{
! 		info.play.encoding = AUDIO_ENCODING_LINEAR;
! 	}
  
  	samplewidth = pwfx->wBitsPerSample / 8;
--- 308,314 ----
  
  	if (pwfx->wBitsPerSample == 8)
! 		format = AUDIO_ENCODING_LINEAR8;
  	else if (pwfx->wBitsPerSample == 16)
! 		format = AUDIO_ENCODING_LINEAR;
  
  	samplewidth = pwfx->wBitsPerSample / 8;
***************
*** 321,328 ****
--- 317,326 ----
  	{
  		info.play.channels = 1;
+ 		stereo = 0;
  	}
  	else if (pwfx->nChannels == 2)
  	{
  		info.play.channels = 2;
+ 		stereo = 1;
  		samplewidth *= 2;
  	}
***************
*** 332,335 ****
--- 330,334 ----
  	info.play.sample_rate = pwfx->nSamplesPerSec;
  	info.play.precision = pwfx->wBitsPerSample;
+ 	info.play.encoding = format;
  	info.play.samples = 0;
  	info.play.eof = 0;


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/