summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-05-09 13:02:25 -0400
committerScott Murray <scott.murray@konsulko.com>2023-05-09 17:11:08 +0000
commitb481828bc0568ab4e4775169ff70fa0d3ae29cd4 (patch)
tree5025b7589022d3722ced8b9c7917a8faa77e28a9 /recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch
parentaf35a74ee956a0628c5e6f929bcb3ca87eb16c48 (diff)
mpd: Fix patch fuzz warning
The one remaining patch after the kirkstone 4.0.9 upgrade is actually also no longer required, but git was somehow managing to apply it with fuzz. From code inspection the result was some duplicated lines of code that would still work. Remove the patch to clean up the fuzz warning and get us back to using a clean upstream. Bug-AGL: SPEC-4768 Change-Id: Icb8b8b2fdd847c4fb81a1a7181589b5c8ccaebc0 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch')
-rw-r--r--recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch b/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch
deleted file mode 100644
index 429e46508..000000000
--- a/recipes-multimedia/musicpd/files/0001-output-PipeWire-activate-stream-in-Drain.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6b430ba271f6d45b3f58c256cb8fede3b04f3b7a Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@gmail.com>
-Date: Sat, 9 Jul 2022 00:21:27 +0200
-Subject: [PATCH] output/PipeWire: activate stream in Drain()
-
-Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/6b430ba271f6d45b3f58c256cb8fede3b04f3b7a]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
----
-diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx b/src/output/plugins/PipeWireOutputPlugin.cxx
-index 524ab3d87..ccdf5c0e4 100644
---- a/src/output/plugins/PipeWireOutputPlugin.cxx
-+++ b/src/output/plugins/PipeWireOutputPlugin.cxx
-@@ -866,6 +866,17 @@ PipeWireOutput::Drain()
- {
- const PipeWire::ThreadLoopLock lock(thread_loop);
-
-+ if (drained)
-+ return;
-+
-+ if (!active) {
-+ /* there is data in the ring_buffer, but the stream is
-+ not yet active; activate it now to ensure it is
-+ played before this method returns */
-+ active = true;
-+ pw_stream_set_active(stream, true);
-+ }
-+
- drain_requested = true;
- AtScopeExit(this) { drain_requested = false; };
-
---
-2.39.0
-