output/alsa: don't lock the mutex in CancelInternal()

CancelInternal() doesn't need to be protected because it is called synchronously from Cancel().

output/alsa: don't lock the mutex in CancelInternal()
b477f86c · Max Kellermann · 020371f1 · b477f86c
Commit b477f86c authored Nov 14, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

No files found.
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -796,6 +796,9 @@ AlsaOutput::Drain()
 inline void
 AlsaOutput::CancelInternal() noexcept
 {
+	/* this method doesn't need to lock the mutex because while it
+	   runs, the calling thread is blocked inside Cancel() */
+
 	must_prepare = true;

 	snd_pcm_drop(pcm);
@@ -804,10 +807,7 @@ AlsaOutput::CancelInternal() noexcept
 	period_buffer.Clear();
 	ring_buffer->reset();

-	{
-		const std::lock_guard<Mutex> lock(mutex);
-		active = false;
-	}
+	active = false;

 	MultiSocketMonitor::Reset();
 	defer_invalidate_sockets.Cancel();