From 43f5a00fcb16f5fb04e6aa5a59efdad3ae566804 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= Date: Thu, 19 Mar 2015 13:50:58 +0200 Subject: [PATCH] dbus: Use hooks for module proplist changes --- src/modules/dbus/iface-module.c | 41 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/modules/dbus/iface-module.c b/src/modules/dbus/iface-module.c index 95a465c86..222cd7359 100644 --- a/src/modules/dbus/iface-module.c +++ b/src/modules/dbus/iface-module.c @@ -36,7 +36,7 @@ struct pa_dbusiface_module { pa_proplist *proplist; pa_dbus_protocol *dbus_protocol; - pa_subscription *subscription; + pa_hook_slot *module_proplist_changed_slot; }; static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata); @@ -264,37 +264,33 @@ static void handle_unload(DBusConnection *conn, DBusMessage *msg, void *userdata pa_dbus_send_empty_reply(conn, msg); } -static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { - pa_dbusiface_module *m = userdata; - DBusMessage *signal_msg = NULL; - - pa_assert(core); - pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_MODULE); - pa_assert(m); +static pa_hook_result_t module_proplist_changed_cb(void *hook_data, void *call_data, void *slot_data) { + pa_dbusiface_module *module_iface = slot_data; + pa_module * module = call_data; + DBusMessage *signal_msg; - /* We can't use idx != m->module->index, because the m->module pointer may - * be stale at this point. */ - if (pa_idxset_get_by_index(core->modules, idx) != m->module) - return; + pa_assert(module_iface); + pa_assert(module); - if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE) - return; + if (module_iface->module != module) + return PA_HOOK_OK; - if (!pa_proplist_equal(m->proplist, m->module->proplist)) { + if (!pa_proplist_equal(module_iface->proplist, module->proplist)) { DBusMessageIter msg_iter; - pa_proplist_update(m->proplist, PA_UPDATE_SET, m->module->proplist); + pa_proplist_update(module_iface->proplist, PA_UPDATE_SET, module->proplist); - pa_assert_se(signal_msg = dbus_message_new_signal(m->path, + pa_assert_se(signal_msg = dbus_message_new_signal(module_iface->path, PA_DBUSIFACE_MODULE_INTERFACE, signals[SIGNAL_PROPERTY_LIST_UPDATED].name)); dbus_message_iter_init_append(signal_msg, &msg_iter); - pa_dbus_append_proplist(&msg_iter, m->proplist); + pa_dbus_append_proplist(&msg_iter, module_iface->proplist); - pa_dbus_protocol_send_signal(m->dbus_protocol, signal_msg); + pa_dbus_protocol_send_signal(module_iface->dbus_protocol, signal_msg); dbus_message_unref(signal_msg); - signal_msg = NULL; } + + return PA_HOOK_OK; } pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module) { @@ -307,7 +303,8 @@ pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module) { m->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, module->index); m->proplist = pa_proplist_copy(module->proplist); m->dbus_protocol = pa_dbus_protocol_get(module->core); - m->subscription = pa_subscription_new(module->core, PA_SUBSCRIPTION_MASK_MODULE, subscription_cb, m); + m->module_proplist_changed_slot = pa_hook_connect(&module->core->hooks[PA_CORE_HOOK_MODULE_PROPLIST_CHANGED], + PA_HOOK_NORMAL, module_proplist_changed_cb, m); pa_assert_se(pa_dbus_protocol_add_interface(m->dbus_protocol, m->path, &module_interface_info, m) >= 0); @@ -321,7 +318,7 @@ void pa_dbusiface_module_free(pa_dbusiface_module *m) { pa_proplist_free(m->proplist); pa_dbus_protocol_unref(m->dbus_protocol); - pa_subscription_free(m->subscription); + pa_hook_slot_free(m->module_proplist_changed_slot); pa_xfree(m->path); pa_xfree(m); -- 2.34.1