output/PipeWire: check SPA_PROP_channelVolumes, not control name

Since PipeWire 0.3.53, there is no control name anymore, therefore the name check doesn't work anymore, breaking volume change events. This obsoletes the crash bug fix in commit 2ee57f9b

output/PipeWire: check SPA_PROP_channelVolumes, not control name
f0894425 · Max Kellermann · 792d6584 · f0894425 · f0894425
Commit f0894425 authored Jul 08, 2022 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

NEWS NEWS +1 -2

PipeWireOutputPlugin.cxx src/output/plugins/PipeWireOutputPlugin.cxx +4 -2

No files found.
--- a/NEWS
+++ b/NEWS
@@ -5,12 +5,11 @@ ver 0.23.8 (not yet released)
  - cdio_paranoia: fix crash if no drive was found
  - cdio_paranoia: faster cancellation
  - cdio_paranoia: don't scan for replay gain tags
-* output
-  - pipewire: fix crash with PipeWire 0.3.53
 * mixer
  - better error messages
  - alsa: fix setting volume before playback starts
  - pipewire: fix crash bug
+  - pipewire: fix volume change events with PipeWire 0.3.53
 * support libfmt 9

 ver 0.23.7 (2022/05/09)

--- a/src/output/plugins/PipeWireOutputPlugin.cxx
+++ b/src/output/plugins/PipeWireOutputPlugin.cxx
@@ -236,9 +236,11 @@ private:

 	void ControlInfo([[maybe_unused]] uint32_t id,
 			 const struct pw_stream_control &control) noexcept {
-		if (control.name != nullptr &&
-		    StringIsEqual(control.name, "Channel Volumes"))
+		switch (id) {
+		case SPA_PROP_channelVolumes:
 			OnChannelVolumes(control);
+			break;
+		}
 	}

 	static void ControlInfo(void *data, uint32_t id,