oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: refactor the drain EAGAIN workaround

Browse Source
This commit is contained in:
Max Kellermann 2018-11-14 10:00:50 +01:00
parent 6c2a6a65e0
commit 7db2450447
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -33,6 +33,7 @@
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/ScopeExit.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"
#include "event/DeferEvent.hxx" #include "event/DeferEvent.hxx"
@ -738,14 +739,15 @@ AlsaOutput::DrainInternal() noexcept
/* .. and finally drain the ALSA hardware buffer */ /* .. and finally drain the ALSA hardware buffer */
int result;
if (work_around_drain_bug) { if (work_around_drain_bug) {
snd_pcm_nonblock(pcm, 0); snd_pcm_nonblock(pcm, 0);
bool result = snd_pcm_drain(pcm) != -EAGAIN; result = snd_pcm_drain(pcm);
snd_pcm_nonblock(pcm, 1); snd_pcm_nonblock(pcm, 1);
return result; } else
} result = snd_pcm_drain(pcm);
return snd_pcm_drain(pcm) != -EAGAIN; return result != -EAGAIN;
} }
void void