ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wait_for_poll can go into an infinite loop. Remove it and replace it 

with snd_pcm_drain which is more likely to do what the original author
intended.
This commit is contained in:
Robert Shearman 2005-07-26 10:31:11 +00:00 committed by Alexandre Julliard
parent aea0ad9172
commit 2cec4f458a
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/winmm/winealsa/audio.c
View File

@ -2051,26 +2051,6 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force)
} }
static void wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count)
{
unsigned short revents;
if (snd_pcm_state(handle) != SND_PCM_STATE_RUNNING)
return;
while (1) {
poll(ufds, count, -1);
snd_pcm_poll_descriptors_revents(handle, ufds, count, &revents);
if (revents & POLLERR)
return;
/*if (revents & POLLOUT)
return 0;*/
}
}
/************************************************************************** /**************************************************************************
* wodPlayer_Reset [internal] * wodPlayer_Reset [internal]
* *
@ -2085,7 +2065,7 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo)
TRACE("(%p)\n", wwo); TRACE("(%p)\n", wwo);
/* flush all possible output */ /* flush all possible output */
wait_for_poll(wwo->pcm, wwo->ufds, wwo->count); snd_pcm_drain(wwo->pcm);
wodUpdatePlayedTotal(wwo, NULL); wodUpdatePlayedTotal(wwo, NULL);
/* updates current notify list */ /* updates current notify list */