ao_pulse: fix subscribe_cb using wrong bitmask for event type

llyyr · kasper93 · commit d8be86067cef · 2026-05-03T06:44:37.000+02:00
PA_SUBSCRIPTION_MASK_SINK is a pa_subscription_mask constant used when registering with pa_context_subscribe(), not a pa_subscription_event_type mask. Masking the event type with it would never match PA_SUBSCRIPTION_EVENT_NEW or PA_SUBSCRIPTION_EVENT_REMOVE, causing hotplug events to be silently dropped. Fixes: e017500
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
@@ -80,7 +80,7 @@ static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t,
                          uint32_t idx, void *userdata)
 {
     struct ao *ao = userdata;
-    int type = t & PA_SUBSCRIPTION_MASK_SINK;
+    int type = t & PA_SUBSCRIPTION_EVENT_TYPE_MASK;
     int fac = t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
     if ((type == PA_SUBSCRIPTION_EVENT_NEW || type == PA_SUBSCRIPTION_EVENT_REMOVE)
         && fac == PA_SUBSCRIPTION_EVENT_SINK)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t,`
`80`	`80`	`uint32_t idx, void *userdata)`
`81`	`81`	`{`
`82`	`82`	`struct ao *ao = userdata;`
`83`		`- int type = t & PA_SUBSCRIPTION_MASK_SINK;`
	`83`	`+ int type = t & PA_SUBSCRIPTION_EVENT_TYPE_MASK;`
`84`	`84`	`int fac = t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;`
`85`	`85`	`if ((type == PA_SUBSCRIPTION_EVENT_NEW \|\| type == PA_SUBSCRIPTION_EVENT_REMOVE)`
`86`	`86`	`&& fac == PA_SUBSCRIPTION_EVENT_SINK)`