output/alsa: call snd_pcm_prepare() if draining is requested early

This fixes a corner case which has probably never occurred and probably never will: if Cancel() is called, and then Play() followed by Drain(), the plugin should really play that data. However currently, this never happens, because snd_pcm_prepare() is never called.

output/alsa: call snd_pcm_prepare() if draining is requested early
4247a757 · Max Kellermann · 57e34823 · 4247a757
Commit 4247a757 authored Nov 14, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

AlsaOutputPlugin.cxx src/output/plugins/AlsaOutputPlugin.cxx +9 -9

No files found.
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -891,6 +891,15 @@ AlsaOutput::DispatchSockets() noexcept
 try {
 	non_block.DispatchSockets(*this, pcm);

+	if (must_prepare) {
+		must_prepare = false;
+
+		int err = snd_pcm_prepare(pcm);
+		if (err < 0)
+			throw FormatRuntimeError("snd_pcm_prepare() failed: %s",
+						 snd_strerror(-err));
+	}
+
 	{
 		const std::lock_guard<Mutex> lock(mutex);

@@ -911,15 +920,6 @@ try {
 		}
 	}

-	if (must_prepare) {
-		must_prepare = false;
-
-		int err = snd_pcm_prepare(pcm);
-		if (err < 0)
-			throw FormatRuntimeError("snd_pcm_prepare() failed: %s",
-						 snd_strerror(-err));
-	}
-
 	CopyRingToPeriodBuffer();

 	if (period_buffer.IsEmpty()) {