X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-multimedia%2Fmusicpd%2Ffiles%2F0002-output-PipeWire-skip-Cancel-if-already-drained.patch;fp=recipes-multimedia%2Fmusicpd%2Ffiles%2F0002-output-PipeWire-skip-Cancel-if-already-drained.patch;h=a01a04a0275ca7e4b6d39867ae201eb9bd91b339;hb=eaed764bc0a02029287d2531bedf13ce123641ee;hp=0000000000000000000000000000000000000000;hpb=1b347d8823db32ee0b58bacd8c8d54553aca1f2f;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch b/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
new file mode 100644
index 000000000..a01a04a02
--- /dev/null
+++ b/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
@@ -0,0 +1,26 @@
+From 493677ff81e708133f87e15157c5dd5131adad48 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann@gmail.com>
+Date: Sat, 9 Jul 2022 00:53:52 +0200
+Subject: [PATCH] output/PipeWire: skip Cancel() if already drained
+
+Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/493677ff81e708133f87e15157c5dd5131adad48]
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+
+---
+diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx b/src/output/plugins/PipeWireOutputPlugin.cxx
+index ccdf5c0e4..7184edfa5 100644
+--- a/src/output/plugins/PipeWireOutputPlugin.cxx
++++ b/src/output/plugins/PipeWireOutputPlugin.cxx
+@@ -892,6 +892,9 @@ PipeWireOutput::Cancel() noexcept
+ 	const PipeWire::ThreadLoopLock lock(thread_loop);
+ 	interrupted = false;
+ 
++	if (drained)
++		return;
++
+ 	ring_buffer->reset();
+ }
+ 
+-- 
+2.39.0
+