CVS: rdesktop rdpsnd_oss.c,1.9,1.10 xwin.c,1.174,1.175

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

Modified Files:
	rdpsnd_oss.c xwin.c 
Log Message:
oss sound fixes


Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rdpsnd_oss.c	13 Aug 2004 09:43:31 -0000	1.9
--- rdpsnd_oss.c	23 Aug 2004 11:13:50 -0000	1.10
***************
*** 239,243 ****
  			elapsed = (tv.tv_sec - startedat_s) * 1000000 + (tv.tv_usec - startedat_us);
  
! 			if (elapsed >= (duration * 7) / 10)
  			{
  				rdpsnd_send_completion(packet->tick, packet->index);
--- 239,243 ----
  			elapsed = (tv.tv_sec - startedat_s) * 1000000 + (tv.tv_usec - startedat_us);
  
! 			if (elapsed >= (duration * 85) / 100)
  			{
  				rdpsnd_send_completion(packet->tick, packet->index);

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** xwin.c	27 Jun 2004 17:51:54 -0000	1.174
--- xwin.c	23 Aug 2004 11:13:50 -0000	1.175
***************
*** 1446,1456 ****
  		rdpdr_check_fds(&rfds, &wfds, (BOOL) False);
  
- 		if (FD_ISSET(rdp_socket, &rfds))
- 			return 1;
- 
  #ifdef WITH_RDPSND
  		if (g_dsp_busy && FD_ISSET(g_dsp_fd, &wfds))
  			wave_out_play();
  #endif
  	}
  }
--- 1446,1456 ----
  		rdpdr_check_fds(&rfds, &wfds, (BOOL) False);
  
  #ifdef WITH_RDPSND
  		if (g_dsp_busy && FD_ISSET(g_dsp_fd, &wfds))
  			wave_out_play();
  #endif
+ 
+ 		if (FD_ISSET(rdp_socket, &rfds))
+ 			return 1;
  	}
  }



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285