CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-04 02:26:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(tinyalsa) Rewrite pcm_wait slightly

Browse Source
This commit is contained in:
twinaphex 2017-06-25 04:24:06 +02:00
parent 8487966c0b
commit 9a382ce6f4
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
audio/drivers/tinyalsa.c
View File

@ -1922,6 +1922,9 @@ static int pcm_avail_update(struct pcm *pcm)
return pcm_mmap_avail(pcm); return pcm_mmap_avail(pcm);
} }
#if 0
/* No longer used */
static int pcm_state(struct pcm *pcm) static int pcm_state(struct pcm *pcm)
{ {
int err = pcm_sync_ptr(pcm, 0); int err = pcm_sync_ptr(pcm, 0);
@ -1930,6 +1933,7 @@ static int pcm_state(struct pcm *pcm)
return pcm->mmap_status->state; return pcm->mmap_status->state;
} }
#endif
/** Waits for frames to be available for read or write operations. /** Waits for frames to be available for read or write operations.
* @param pcm A PCM handle. * @param pcm A PCM handle.
@ -1942,15 +1946,14 @@ static int pcm_state(struct pcm *pcm)
static int pcm_wait(struct pcm *pcm, int timeout) static int pcm_wait(struct pcm *pcm, int timeout)
{ {
struct pollfd pfd; struct pollfd pfd;
int err;
pfd.fd = pcm->fd; pfd.fd = pcm->fd;
pfd.events = POLLIN | POLLOUT | POLLERR | POLLNVAL; pfd.events = POLLIN | POLLOUT | POLLERR | POLLNVAL;
do do
{ {
/* let's wait for avail or timeout */ /* let's wait for avail or timeout */
err = poll(&pfd, 1, timeout); int err = poll(&pfd, 1, timeout);
if (err < 0) if (err < 0)
return -errno; return -errno;
@ -1965,7 +1968,11 @@ static int pcm_wait(struct pcm *pcm, int timeout)
/* check for any errors */ /* check for any errors */
if (pfd.revents & (POLLERR | POLLNVAL)) if (pfd.revents & (POLLERR | POLLNVAL))
{ {
switch (pcm_state(pcm)) int cond = pcm_sync_ptr(pcm, 0);
if (cond >= 0)
cond = pcm->mmap_status->state;
switch (cond)
{ {
case PCM_STATE_XRUN: case PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;