ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5106 from Scheiker/tinyalsa 

Remove extra error handling in tinyalsa_write for now
This commit is contained in:
Twinaphex 2017-06-25 06:55:28 +02:00 committed by GitHub
parent 56f0bc2dcc 15ca6c9507
commit e34dc17859
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
audio/drivers/tinyalsa.c
View File

@ -2207,12 +2207,6 @@ tinyalsa_write(void *data, const void *buf_, size_t size_)
{ {
pcm_sframes_t frames = pcm_writei(tinyalsa->pcm, buf, size); pcm_sframes_t frames = pcm_writei(tinyalsa->pcm, buf, size);
if (frames == -EPIPE || frames == -EINTR || frames == -ESTRPIPE)
{
break;
}
else if (frames == -EAGAIN)
break;
if (frames < 0) if (frames < 0)
return -1; return -1;
@ -2228,28 +2222,11 @@ tinyalsa_write(void *data, const void *buf_, size_t size_)
while (size) while (size)
{ {
pcm_sframes_t frames; pcm_sframes_t frames;
int rc = pcm_wait(tinyalsa->pcm, -1); pcm_wait(tinyalsa->pcm, -1);
if (rc == -EPIPE || rc == -ESTRPIPE || rc == -EINTR)
continue;
frames = pcm_writei(tinyalsa->pcm, buf, size); frames = pcm_writei(tinyalsa->pcm, buf, size);
if (frames == -EPIPE || frames == -EINTR || frames == -ESTRPIPE) if (frames < 0)
{
break;
}
else if (frames == -EAGAIN)
{
/* Definitely not supposed to happen. */
if (eagain_retry)
{
eagain_retry = false;
continue;
}
break;
}
else if (frames < 0)
return -1; return -1;
written += frames; written += frames;