CVS: rdesktop rdpsnd_oss.c,1.25,1.26

Michael Gernoth <[email protected]> Sun, 01 Oct 2006 04:08:12 -0700
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8779

Modified Files:
	rdpsnd_oss.c 
Log Message:
do not lose the first mixer event in oss


Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** rdpsnd_oss.c	18 Sep 2006 10:17:24 -0000	1.25
--- rdpsnd_oss.c	1 Oct 2006 11:08:09 -0000	1.26
***************
*** 163,168 ****
  	if (ioctl(g_dsp_fd, MIXER_WRITE(SOUND_MIXER_PCM), &volume) == -1)
  	{
! 		perror("MIXER_WRITE(SOUND_MIXER_PCM)");
  		oss_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
  		return;
  	}
--- 163,169 ----
  	if (ioctl(g_dsp_fd, MIXER_WRITE(SOUND_MIXER_PCM), &volume) == -1)
  	{
! 		warning("hardware volume control unavailable, falling back to software volume control!\n");
  		oss_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
+ 		rdpsnd_dsp_softvol_set(left, right);
  		return;
  	}


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