mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: Use hook for sample cache proplist changes

Browse source
This commit is contained in:
Juho Hämäläinen 2015-03-19 13:50:56 +02:00 • committed by David Henningsson
parent 4e8a62c3c2
commit 7e0d0b8b00
1 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,8 +37,9 @@ struct pa_dbusiface_sample {
char *path; char *path;
pa_proplist *proplist; pa_proplist *proplist;
pa_hook_slot *sample_cache_changed_slot;
pa_dbus_protocol *dbus_protocol; pa_dbus_protocol *dbus_protocol;
pa_subscription *subscription;
}; };
static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata); static void handle_get_index(DBusConnection *conn, DBusMessage *msg, void *userdata);
@ -446,36 +447,33 @@ static void handle_remove(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 *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { static pa_hook_result_t sample_cache_changed_cb(void *hook_data, void *call_data, void *slot_data) {
pa_dbusiface_sample *s = userdata; pa_dbusiface_sample *sample_iface = slot_data;
DBusMessage *signal_msg = NULL; pa_scache_entry *sample = call_data;
DBusMessage *signal_msg;
pa_assert(c); pa_assert(sample);
pa_assert(s); pa_assert(sample_iface);
/* We can't use idx != s->sample->index, because the s->sample pointer may if (sample_iface->sample != sample)
* be stale at this point. */ return PA_HOOK_OK;
if (pa_idxset_get_by_index(c->scache, idx) != s->sample)
return;
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE) if (!pa_proplist_equal(sample_iface->proplist, sample_iface->sample->proplist)) {
return;
if (!pa_proplist_equal(s->proplist, s->sample->proplist)) {
DBusMessageIter msg_iter; DBusMessageIter msg_iter;
pa_proplist_update(s->proplist, PA_UPDATE_SET, s->sample->proplist); pa_proplist_update(sample_iface->proplist, PA_UPDATE_SET, sample_iface->sample->proplist);
pa_assert_se(signal_msg = dbus_message_new_signal(s->path, pa_assert_se(signal_msg = dbus_message_new_signal(sample_iface->path,
PA_DBUSIFACE_SAMPLE_INTERFACE, PA_DBUSIFACE_SAMPLE_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, s->proplist); pa_dbus_append_proplist(&msg_iter, sample_iface->proplist);
pa_dbus_protocol_send_signal(s->dbus_protocol, signal_msg); pa_dbus_protocol_send_signal(sample_iface->dbus_protocol, signal_msg);
dbus_message_unref(signal_msg); dbus_message_unref(signal_msg);
signal_msg = NULL;
} }
return PA_HOOK_OK;
} }
pa_dbusiface_sample *pa_dbusiface_sample_new(pa_dbusiface_core *core, pa_scache_entry *sample) { pa_dbusiface_sample *pa_dbusiface_sample_new(pa_dbusiface_core *core, pa_scache_entry *sample) {
@ -490,7 +488,8 @@ pa_dbusiface_sample *pa_dbusiface_sample_new(pa_dbusiface_core *core, pa_scache_
s->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, sample->index); s->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, sample->index);
s->proplist = pa_proplist_copy(sample->proplist); s->proplist = pa_proplist_copy(sample->proplist);
s->dbus_protocol = pa_dbus_protocol_get(sample->core); s->dbus_protocol = pa_dbus_protocol_get(sample->core);
s->subscription = pa_subscription_new(sample->core, PA_SUBSCRIPTION_MASK_SAMPLE_CACHE, subscription_cb, s); s->sample_cache_changed_slot = pa_hook_connect(&sample->core->hooks[PA_CORE_HOOK_SAMPLE_CACHE_CHANGED],
PA_HOOK_NORMAL, sample_cache_changed_cb, s);
pa_assert_se(pa_dbus_protocol_add_interface(s->dbus_protocol, s->path, &sample_interface_info, s) >= 0); pa_assert_se(pa_dbus_protocol_add_interface(s->dbus_protocol, s->path, &sample_interface_info, s) >= 0);
@ -502,9 +501,9 @@ void pa_dbusiface_sample_free(pa_dbusiface_sample *s) {
pa_assert_se(pa_dbus_protocol_remove_interface(s->dbus_protocol, s->path, sample_interface_info.name) >= 0); pa_assert_se(pa_dbus_protocol_remove_interface(s->dbus_protocol, s->path, sample_interface_info.name) >= 0);
pa_hook_slot_free(s->sample_cache_changed_slot);
pa_proplist_free(s->proplist); pa_proplist_free(s->proplist);
pa_dbus_protocol_unref(s->dbus_protocol); pa_dbus_protocol_unref(s->dbus_protocol);
pa_subscription_free(s->subscription);
pa_xfree(s->path); pa_xfree(s->path);
pa_xfree(s); pa_xfree(s);