asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 17:06:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

axfer: return ETIMEDOUT when no event occurs after waiter expiration

Browse source 
Although the waiter abstraction handles timeout as success, it should
report for callers to know timeout.

This commit takes the waiter to return -ETIMEDOUT when timeout expires.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Sakamoto 2019-10-30 00:12:11 +09:00 committed by Jaroslav Kysela
parent 1c17128410
commit e5e6a7838b
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
axfer/xfer-libasound.c
View file

@ -343,21 +343,28 @@ static int prepare_waiter(struct libasound_state *state)
int xfer_libasound_wait_event(struct libasound_state *state, int timeout_msec,
unsigned short *revents)
{
int err;
int count;
if (state->waiter_type != WAITER_TYPE_DEFAULT) {
struct waiter_context *waiter = state->waiter;
int err;
err = waiter_context_wait_event(waiter, timeout_msec);
if (err < 0)
return err;
count = waiter_context_wait_event(waiter, timeout_msec);
if (count < 0)
return count;
if (count == 0 && timeout_msec > 0)
return -ETIMEDOUT;
err = snd_pcm_poll_descriptors_revents(state->handle,
waiter->pfds, waiter->pfd_count, revents);
} else {
err = snd_pcm_wait(state->handle, timeout_msec);
if (err < 0)
return err;
} else {
count = snd_pcm_wait(state->handle, timeout_msec);
if (count < 0)
return count;
if (count == 0 && timeout_msec > 0)
return -ETIMEDOUT;
if (snd_pcm_stream(state->handle) == SND_PCM_STREAM_PLAYBACK)
*revents = POLLOUT;
@ -365,7 +372,7 @@ int xfer_libasound_wait_event(struct libasound_state *state, int timeout_msec,
*revents = POLLIN;
}
return err;
return 0;
}
static int configure_hw_params(struct libasound_state *state,