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: Save one level of identation by returning early.

Browse source
This commit is contained in:
Tanu Kaskinen 2009-08-26 14:12:42 +03:00
parent 2f3fc2f1d6
commit 3e0e685a8c
2 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/modules/dbus/iface-card.c
View file

@ -459,45 +459,46 @@ static void handle_get_profile_by_name(DBusConnection *conn, DBusMessage *msg, v
static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
pa_dbusiface_card *c = userdata; pa_dbusiface_card *c = userdata;
DBusMessage *signal = NULL;
pa_assert(core); pa_assert(core);
pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_CARD); pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_CARD);
pa_assert(c); pa_assert(c);
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE) {
DBusMessage *signal = NULL;
if (c->active_profile != c->card->active_profile) { if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
const char *object_path; return;
c->active_profile = c->card->active_profile; if (c->active_profile != c->card->active_profile) {
object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name)); const char *object_path;
pa_assert_se(signal = dbus_message_new_signal(c->path, c->active_profile = c->card->active_profile;
PA_DBUSIFACE_CARD_INTERFACE, object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
pa_dbus_protocol_send_signal(c->dbus_protocol, signal); pa_assert_se(signal = dbus_message_new_signal(c->path,
dbus_message_unref(signal); PA_DBUSIFACE_CARD_INTERFACE,
signal = NULL; signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
} pa_assert_se(dbus_message_append_args(signal, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID));
if (!pa_proplist_equal(c->proplist, c->card->proplist)) { pa_dbus_protocol_send_signal(c->dbus_protocol, signal);
DBusMessageIter msg_iter; dbus_message_unref(signal);
signal = NULL;
}
pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist); if (!pa_proplist_equal(c->proplist, c->card->proplist)) {
DBusMessageIter msg_iter;
pa_assert_se(signal = dbus_message_new_signal(c->path, pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist);
PA_DBUSIFACE_CARD_INTERFACE,
signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
dbus_message_iter_init_append(signal, &msg_iter);
pa_dbus_append_proplist(&msg_iter, c->proplist);
pa_dbus_protocol_send_signal(c->dbus_protocol, signal); pa_assert_se(signal = dbus_message_new_signal(c->path,
dbus_message_unref(signal); PA_DBUSIFACE_CARD_INTERFACE,
signal = NULL; signals[SIGNAL_PROPERTY_LIST_UPDATED].name));
} dbus_message_iter_init_append(signal, &msg_iter);
pa_dbus_append_proplist(&msg_iter, c->proplist);
pa_dbus_protocol_send_signal(c->dbus_protocol, signal);
dbus_message_unref(signal);
signal = NULL;
} }
} }

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

@ -268,29 +268,29 @@ static void handle_unload(DBusConnection *conn, DBusMessage *msg, void *userdata
static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) { static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
pa_dbusiface_module *m = userdata; pa_dbusiface_module *m = userdata;
DBusMessage *signal = NULL;
pa_assert(core); pa_assert(core);
pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_MODULE); pa_assert((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_MODULE);
pa_assert(m); pa_assert(m);
if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE) { if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
DBusMessage *signal = NULL; return;
if (!pa_proplist_equal(m->proplist, m->module->proplist)) { 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(m->proplist, PA_UPDATE_SET, m->module->proplist);
pa_assert_se(signal = dbus_message_new_signal(m->path, pa_assert_se(signal = dbus_message_new_signal(m->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_iter); dbus_message_iter_init_append(signal, &msg_iter);
pa_dbus_append_proplist(&msg_iter, m->proplist); pa_dbus_append_proplist(&msg_iter, m->proplist);
pa_dbus_protocol_send_signal(m->dbus_protocol, signal); pa_dbus_protocol_send_signal(m->dbus_protocol, signal);
dbus_message_unref(signal); dbus_message_unref(signal);
signal = NULL; signal = NULL;
}
} }
} }