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

output/alsa: throw after snd_pcm_drain() error

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

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

@@ -258,10 +258,12 @@ private:
/** /**
* Drain all buffers. To be run in #EventLoop's thread. * Drain all buffers. To be run in #EventLoop's thread.
* *
* Throws on error.
*
* @return true if draining is complete, false if this method * @return true if draining is complete, false if this method
* needs to be called again later * needs to be called again later
*/ */
bool DrainInternal() noexcept; bool DrainInternal();
/** /**
* Stop playback immediately, dropping all buffers. To be run * Stop playback immediately, dropping all buffers. To be run
@@ -711,7 +713,7 @@ AlsaOutput::Recover(int err) noexcept
} }
inline bool inline bool
AlsaOutput::DrainInternal() noexcept AlsaOutput::DrainInternal()
{ {
/* drain ring_buffer */ /* drain ring_buffer */
CopyRingToPeriodBuffer(); CopyRingToPeriodBuffer();
@@ -747,7 +749,13 @@ AlsaOutput::DrainInternal() noexcept
} else } else
result = snd_pcm_drain(pcm); result = snd_pcm_drain(pcm);
return result != -EAGAIN; if (result == 0)
return true;
else if (result == -EAGAIN)
return false;
else
throw FormatRuntimeError("snd_pcm_drain() failed: %s",
snd_strerror(-result));
} }
void void