CVS: rdesktop rdpsnd_oss.c,1.29,1.30

Peter Åstrand <[email protected]> Thu, 02 Nov 2006 03:56:02 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2959

Modified Files:
	rdpsnd_oss.c 
Log Message:
After closing g_dsp_fd, set g_dsp_busy to false. This prevents errors of type: ERROR: select: Bad file descriptor

Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** rdpsnd_oss.c	26 Oct 2006 09:47:17 -0000	1.29
--- rdpsnd_oss.c	2 Nov 2006 11:55:59 -0000	1.30
***************
*** 90,93 ****
--- 90,94 ----
  {
  	close(g_dsp_fd);
+ 	g_dsp_busy = 0;
  }
  
***************
*** 124,128 ****
  	{
  		perror("SNDCTL_DSP_SETFMT");
! 		close(g_dsp_fd);
  		return False;
  	}
--- 125,129 ----
  	{
  		perror("SNDCTL_DSP_SETFMT");
! 		oss_close();
  		return False;
  	}
***************
*** 141,145 ****
  	{
  		perror("SNDCTL_DSP_CHANNELS");
! 		close(g_dsp_fd);
  		return False;
  	}
--- 142,146 ----
  	{
  		perror("SNDCTL_DSP_CHANNELS");
! 		oss_close();
  		return False;
  	}
***************
*** 163,167 ****
  				{
  					error("rdpsnd_dsp_resample_set failed");
! 					close(g_dsp_fd);
  					return False;
  				}
--- 164,168 ----
  				{
  					error("rdpsnd_dsp_resample_set failed");
! 					oss_close();
  					return False;
  				}
***************
*** 175,179 ****
  		{
  			perror("SNDCTL_DSP_SPEED");
! 			close(g_dsp_fd);
  			return False;
  		}
--- 176,180 ----
  		{
  			perror("SNDCTL_DSP_SPEED");
! 			oss_close();
  			return False;
  		}
***************
*** 192,196 ****
  		{
  			perror("SNDCTL_DSP_GETOSPACE");
! 			close(g_dsp_fd);
  			return False;
  		}
--- 193,197 ----
  		{
  			perror("SNDCTL_DSP_GETOSPACE");
! 			oss_close();
  			return False;
  		}


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