From 5632b932bc46b7a983825d1df11085eef43cfc4c Mon Sep 17 00:00:00 2001 From: Michael Gernoth Date: Mon, 23 Aug 2004 11:13:50 +0000 Subject: [PATCH] oss sound fixes git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@752 423420c4-83ab-492f-b58f-81f9feb106b5 --- rdpsnd_oss.c | 2 +- xwin.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rdpsnd_oss.c b/rdpsnd_oss.c index a7574bd..101c30a 100644 --- a/rdpsnd_oss.c +++ b/rdpsnd_oss.c @@ -238,7 +238,7 @@ wave_out_play(void) duration = (out->size * (1000000 / (g_samplewidth * g_snd_rate))); elapsed = (tv.tv_sec - startedat_s) * 1000000 + (tv.tv_usec - startedat_us); - if (elapsed >= (duration * 7) / 10) + if (elapsed >= (duration * 85) / 100) { rdpsnd_send_completion(packet->tick, packet->index); free(out->data); diff --git a/xwin.c b/xwin.c index 990c1cd..f37a248 100644 --- a/xwin.c +++ b/xwin.c @@ -1445,13 +1445,13 @@ ui_select(int rdp_socket) 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 + + if (FD_ISSET(rdp_socket, &rfds)) + return 1; } }