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

Merge branch 'alsa-drain-recovery' of https://github.com/borine/MPD

Browse Source
This commit is contained in:
Max Kellermann 2024-04-15 22:21:53 +02:00
commit 9c7b930f8f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -910,7 +910,6 @@ AlsaOutput::Recover(int err) noexcept
/* fall-through to snd_pcm_prepare: */ /* fall-through to snd_pcm_prepare: */
[[fallthrough]]; [[fallthrough]];
case SND_PCM_STATE_OPEN:
case SND_PCM_STATE_SETUP: case SND_PCM_STATE_SETUP:
case SND_PCM_STATE_XRUN: case SND_PCM_STATE_XRUN:
period_buffer.Rewind(); period_buffer.Rewind();
@ -918,6 +917,7 @@ AlsaOutput::Recover(int err) noexcept
err = snd_pcm_prepare(pcm); err = snd_pcm_prepare(pcm);
break; break;
case SND_PCM_STATE_OPEN:
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
case SND_PCM_STATE_DRAINING: case SND_PCM_STATE_DRAINING:
/* can't play in this state; throw the error */ /* can't play in this state; throw the error */
@ -1002,14 +1002,19 @@ AlsaOutput::DrainInternal()
period_buffer.FillWithSilence(silence, out_frame_size); period_buffer.FillWithSilence(silence, out_frame_size);
/* drain period_buffer */ /* drain period_buffer */
if (!period_buffer.IsDrained()) { unsigned int retry_count = 0;
while (!period_buffer.IsDrained() && retry_count <= 1) {
auto frames_written = WriteFromPeriodBuffer(); auto frames_written = WriteFromPeriodBuffer();
if (frames_written < 0) { if (frames_written < 0) {
if (frames_written == -EAGAIN) if (frames_written == -EAGAIN || frames_written == -EINTR)
return false; return false;
throw Alsa::MakeError(frames_written, if (Recover(frames_written) < 0)
"snd_pcm_writei() failed"); throw Alsa::MakeError(frames_written,
"snd_pcm_writei() failed");
retry_count++;
continue;
} }
/* need to call CopyRingToPeriodBuffer() and /* need to call CopyRingToPeriodBuffer() and