mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

A next try to fix the snd_pcm_wait() behaviour with direct plugins

Browse source
This commit is contained in:
Jaroslav Kysela 2004-03-24 08:50:01 +00:00
parent f2175f1384
commit f5a5284c6d
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/pcm/pcm.c
View file

@ -2082,20 +2082,10 @@ int snd_pcm_wait(snd_pcm_t *pcm, int timeout)
} }
err = snd_pcm_poll_descriptors(pcm, &pfd, 1); err = snd_pcm_poll_descriptors(pcm, &pfd, 1);
assert(err == 1); assert(err == 1);
__retry:
err_poll = poll(&pfd, 1, timeout); err_poll = poll(&pfd, 1, timeout);
if (err_poll < 0) if (err_poll < 0)
return -errno; return -errno;
#if 0 /* very useful code to test poll related problems */
{
snd_pcm_sframes_t delay, avail_update;
snd_pcm_hwsync(pcm);
avail_update = snd_pcm_avail_update(pcm);
if (avail_update < pcm->avail_min) {
printf("*** snd_pcm_wait() FATAL ERROR!!!\n");
printf("avail_min = %li, avail_update = %li\n", pcm->avail_min, avail_update);
}
}
#endif
err = snd_pcm_poll_descriptors_revents(pcm, &pfd, 1, &revents); err = snd_pcm_poll_descriptors_revents(pcm, &pfd, 1, &revents);
if (err < 0) if (err < 0)
return err; return err;
@ -2112,6 +2102,19 @@ int snd_pcm_wait(snd_pcm_t *pcm, int timeout)
return -EIO; return -EIO;
} }
} }
if ((revents & (POLLIN | POLLOUT)) == 0)
goto __retry;
#if 0 /* very useful code to test poll related problems */
{
snd_pcm_sframes_t avail_update;
snd_pcm_hwsync(pcm);
avail_update = snd_pcm_avail_update(pcm);
if (avail_update < (snd_pcm_sframes_t)pcm->avail_min) {
printf("*** snd_pcm_wait() FATAL ERROR!!!\n");
printf("avail_min = %li, avail_update = %li\n", pcm->avail_min, avail_update);
}
}
#endif
return err_poll > 0 ? 1 : 0; return err_poll > 0 ? 1 : 0;
} }

3
src/pcm/pcm_direct.c
View file

@ -427,6 +427,7 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in
events = pfds[0].revents; events = pfds[0].revents;
if (events & POLLIN) { if (events & POLLIN) {
int empty = 0; int empty = 0;
snd_pcm_avail_update(pcm);
if (pcm->stream == SND_PCM_STREAM_PLAYBACK) { if (pcm->stream == SND_PCM_STREAM_PLAYBACK) {
events |= POLLOUT; events |= POLLOUT;
events &= ~POLLIN; events &= ~POLLIN;
@ -436,6 +437,8 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in
} }
/* empty the timer read queue */ /* empty the timer read queue */
while (empty && snd_timer_read(dmix->timer, &rbuf, sizeof(rbuf)) == sizeof(rbuf)) ; while (empty && snd_timer_read(dmix->timer, &rbuf, sizeof(rbuf)) == sizeof(rbuf)) ;
if (empty)
events &= ~(POLLOUT|POLLIN);
} }
*revents = events; *revents = events;
return 0; return 0;