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=0000000000000000000000000000000000000000;hb=6d435b0bbfa3ab11e571a284c01f5735edcba49f;hp=a01a04a0275ca7e4b6d39867ae201eb9bd91b339;hpb=af93b8c62bdb3de9f0039649c8be16ae2311e3d3;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
deleted file mode 100644
index a01a04a02..000000000
--- a/recipes-multimedia/musicpd/files/0002-output-PipeWire-skip-Cancel-if-already-drained.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-