mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: Use hooks for module proplist changes

Browse source
This commit is contained in:
Juho Hämäläinen 2015-03-19 13:50:58 +02:00 • committed by David Henningsson
parent ae415b07a0
commit 43f5a00fcb
1 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/modules/dbus/iface-module.c
View file

@ -36,7 +36,7 @@ struct pa_dbusiface_module {
pa_proplist *proplist; pa_proplist *proplist;
pa_dbus_protocol *dbus_protocol; 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); 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); 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) { static pa_hook_result_t module_proplist_changed_cb(void *hook_data, void *call_data, void *slot_data) {
pa_dbusiface_module *m = userdata; pa_dbusiface_module *module_iface = slot_data;
DBusMessage *signal_msg = NULL; pa_module * module = call_data;
DBusMessage *signal_msg;
pa_assert(core); pa_assert(module_iface);
pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_MODULE); pa_assert(module);
pa_assert(m);
/* We can't use idx != m->module->index, because the m->module pointer may if (module_iface->module != module)
* be stale at this point. */ return PA_HOOK_OK;
if (pa_idxset_get_by_index(core->modules, idx) != m->module)
return;
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE) if (!pa_proplist_equal(module_iface->proplist, module->proplist)) {
return;
if (!pa_proplist_equal(m->proplist, m->module->proplist)) {
DBusMessageIter msg_iter; 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, PA_DBUSIFACE_MODULE_INTERFACE,
signals[SIGNAL_PROPERTY_LIST_UPDATED].name)); signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal_msg, &msg_iter); 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); dbus_message_unref(signal_msg);
signal_msg = NULL;
} }
return PA_HOOK_OK;
} }
pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module) { 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->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, module->index);
m->proplist = pa_proplist_copy(module->proplist); m->proplist = pa_proplist_copy(module->proplist);
m->dbus_protocol = pa_dbus_protocol_get(module->core); 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); 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_proplist_free(m->proplist);
pa_dbus_protocol_unref(m->dbus_protocol); 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->path);
pa_xfree(m); pa_xfree(m);