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

dmix plugin: fix drain for nonblock mode

Browse source
This commit is contained in:
Jaroslav Kysela 2017-03-20 08:34:33 +01:00
parent ad188bbf78
commit fdc898d411
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pcm/pcm_dmix.c
View file

@ -628,7 +628,7 @@ static int __snd_pcm_dmix_drain(snd_pcm_t *pcm)
{ {
snd_pcm_direct_t *dmix = pcm->private_data; snd_pcm_direct_t *dmix = pcm->private_data;
snd_pcm_uframes_t stop_threshold; snd_pcm_uframes_t stop_threshold;
int err; int err = 0;
switch (snd_pcm_state(dmix->spcm)) { switch (snd_pcm_state(dmix->spcm)) {
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
@ -639,8 +639,6 @@ static int __snd_pcm_dmix_drain(snd_pcm_t *pcm)
if (dmix->state == SND_PCM_STATE_OPEN) if (dmix->state == SND_PCM_STATE_OPEN)
return -EBADFD; return -EBADFD;
if (pcm->mode & SND_PCM_NONBLOCK)
return -EAGAIN;
if (dmix->state == SND_PCM_STATE_PREPARED) { if (dmix->state == SND_PCM_STATE_PREPARED) {
if (snd_pcm_mmap_playback_hw_avail(pcm) > 0) if (snd_pcm_mmap_playback_hw_avail(pcm) > 0)
snd_pcm_dmix_start(pcm); snd_pcm_dmix_start(pcm);
@ -663,23 +661,33 @@ static int __snd_pcm_dmix_drain(snd_pcm_t *pcm)
err = snd_pcm_dmix_sync_ptr(pcm); err = snd_pcm_dmix_sync_ptr(pcm);
if (err < 0) { if (err < 0) {
snd_pcm_dmix_drop(pcm); snd_pcm_dmix_drop(pcm);
return err; goto done;
} }
if (dmix->state == SND_PCM_STATE_DRAINING) { if (dmix->state == SND_PCM_STATE_DRAINING) {
snd_pcm_dmix_sync_area(pcm); snd_pcm_dmix_sync_area(pcm);
if ((pcm->mode & SND_PCM_NONBLOCK) == 0) {
snd_pcm_wait_nocheck(pcm, -1); snd_pcm_wait_nocheck(pcm, -1);
snd_pcm_direct_clear_timer_queue(dmix); /* force poll to wait */ snd_pcm_direct_clear_timer_queue(dmix); /* force poll to wait */
}
switch (snd_pcm_state(dmix->spcm)) { switch (snd_pcm_state(dmix->spcm)) {
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE; err = -ESTRPIPE;
goto done;
case SND_PCM_STATE_DRAINING:
if (pcm->mode & SND_PCM_NONBLOCK) {
err = -EAGAIN;
goto done;
}
break;
default: default:
break; break;
} }
} }
} while (dmix->state == SND_PCM_STATE_DRAINING); } while (dmix->state == SND_PCM_STATE_DRAINING);
done:
pcm->stop_threshold = stop_threshold; pcm->stop_threshold = stop_threshold;
return 0; return err;
} }
static int snd_pcm_dmix_drain(snd_pcm_t *pcm) static int snd_pcm_dmix_drain(snd_pcm_t *pcm)