colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m-standard-event-source: fix params of on-params-changed event

Browse Source
This commit is contained in:
Ashok Sidipotu
2022-06-30 11:18:09 +05:30
committed by Julian Bouzas
parent 025b0f6e2e
commit a6b3f1c1fb
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/module-standard-event-source.c
View File

@@ -87,7 +87,7 @@ on_metadata_changed (WpMetadata *obj, guint32 subject,
g_autoptr (WpEventDispatcher) dispatcher = g_autoptr (WpEventDispatcher) dispatcher =
wp_event_dispatcher_get_instance (core); wp_event_dispatcher_get_instance (core);
g_return_if_fail (dispatcher); g_return_if_fail (dispatcher);
WpProperties *p = wp_properties_new_empty (); g_autoptr (WpProperties) props = wp_properties_new_empty ();
const gchar *type = NULL; const gchar *type = NULL;
gint priority = 0; gint priority = 0;
@@ -97,14 +97,14 @@ on_metadata_changed (WpMetadata *obj, guint32 subject,
return; return;
} }
wp_properties_set (p, "event.subject.type", type); wp_properties_set (props, "event.subject.type", type);
wp_properties_setf (p, "event.subject.id", "%u", subject); wp_properties_setf (props, "event.subject.id", "%u", subject);
wp_properties_set (p, "event.subject.key", key); wp_properties_set (props, "event.subject.key", key);
wp_properties_set (p, "event.subject.spa_type", spa_type); wp_properties_set (props, "event.subject.spa_type", spa_type);
wp_properties_set (p, "event.subject.value", value); wp_properties_set (props, "event.subject.value", value);
wp_event_dispatcher_push_event (dispatcher, wp_event_new ( wp_event_dispatcher_push_event (dispatcher, wp_event_new (
"object-changed", priority, g_steal_pointer (&p), "object-changed", priority, g_steal_pointer (&props),
G_OBJECT (self->om), G_OBJECT (obj))); G_OBJECT (self->om), G_OBJECT (obj)));
} }
@@ -116,10 +116,22 @@ on_params_changed (WpPipewireObject *obj, const gchar *id,
g_return_if_fail (core); g_return_if_fail (core);
g_autoptr (WpEventDispatcher) dispatcher = g_autoptr (WpEventDispatcher) dispatcher =
wp_event_dispatcher_get_instance (core); wp_event_dispatcher_get_instance (core);
g_return_if_fail (dispatcher);
g_autoptr (WpProperties) props = wp_properties_new_empty ();
const gchar *type = NULL;
gint priority = 0;
if (G_UNLIKELY (!get_object_type_and_priority (obj, &type, &priority))) {
wp_critical_object (self, "unknown object type: " WP_OBJECT_FORMAT,
WP_OBJECT_ARGS (obj));
return;
}
wp_properties_set (props, "event.subject.type", type);
wp_properties_set (props, "event.subject.param-id", id);
wp_event_dispatcher_push_event (dispatcher, wp_event_new ( wp_event_dispatcher_push_event (dispatcher, wp_event_new (
"params-changed", 50, "params-changed", priority, g_steal_pointer (&props),
wp_properties_new ("event.subject.param-id", id, NULL),
G_OBJECT (self->om), G_OBJECT (obj))); G_OBJECT (self->om), G_OBJECT (obj)));
} }