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

Synchronized snd_pcm_write_areas and snd_pcm_read_areas with the kernel

Browse source 
write/read functions.
Changed snd_pcm_xfer_areas_func_t to return snd_pcm_sframes_t (pass errors).
This commit is contained in:
Jaroslav Kysela 2001-12-09 12:32:42 +00:00
parent 9d34cf954a
commit b63e44aab0
5 changed files with 56 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/pcm/pcm.c
View file

@ -4945,7 +4945,7 @@ snd_pcm_sframes_t snd_pcm_read_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_
snd_pcm_xfer_areas_func_t func)
{
snd_pcm_uframes_t xfer = 0;
int err = 0;
snd_pcm_sframes_t err = 0;
snd_pcm_state_t state = snd_pcm_state(pcm);
if (size == 0)
@ -4976,17 +4976,17 @@ snd_pcm_sframes_t snd_pcm_read_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_
_again:
avail = snd_pcm_avail_update(pcm);
if (avail < 0) {
err = -EPIPE;
err = avail;
goto _end;
}
if (state == SND_PCM_STATE_DRAINING) {
if (avail == 0) {
if ((state == SND_PCM_STATE_PAUSED) ||
(state == SND_PCM_STATE_DRAINING)) {
if ((snd_pcm_uframes_t)avail < pcm->xfer_align) {
err = -EPIPE;
goto _end;
}
} else if (avail == 0 ||
(size >= pcm->xfer_align &&
(snd_pcm_uframes_t) avail < pcm->xfer_align)) {
} else if (((snd_pcm_uframes_t)avail < pcm->avail_min && size > (snd_pcm_uframes_t)avail) ||
(size >= pcm->xfer_align && (snd_pcm_uframes_t)avail < pcm->xfer_align)) {
if (pcm->mode & SND_PCM_NONBLOCK) {
err = -EAGAIN;
goto _end;
@ -5029,7 +5029,7 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
snd_pcm_xfer_areas_func_t func)
{
snd_pcm_uframes_t xfer = 0;
int err = 0;
snd_pcm_sframes_t err = 0;
snd_pcm_state_t state = snd_pcm_state(pcm);
if (size == 0)
@ -5051,19 +5051,26 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
snd_pcm_uframes_t frames;
snd_pcm_sframes_t avail;
_again:
if (pcm->sleep_min == 0 && state == SND_PCM_STATE_RUNNING) {
snd_pcm_sframes_t delay;
/* update hw_ptr */
err = snd_pcm_delay(pcm, &delay);
if (err < 0)
goto _end;
}
avail = snd_pcm_avail_update(pcm);
if (avail < 0) {
err = -EPIPE;
err = avail;
goto _end;
}
if (state == SND_PCM_STATE_PREPARED) {
if (avail == 0) {
if (state == SND_PCM_STATE_PAUSED ||
state == SND_PCM_STATE_PREPARED) {
if ((snd_pcm_uframes_t)avail < pcm->xfer_align) {
err = -EPIPE;
goto _end;
}
} else if (avail == 0 ||
(size >= pcm->xfer_align &&
(snd_pcm_uframes_t) avail < pcm->xfer_align)) {
} else if (((snd_pcm_uframes_t)avail < pcm->avail_min && size > (snd_pcm_uframes_t)avail) ||
(size >= pcm->xfer_align && (snd_pcm_uframes_t)avail < pcm->xfer_align)) {
if (pcm->mode & SND_PCM_NONBLOCK) {
err = -EAGAIN;
goto _end;