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

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

@ -459,13 +459,15 @@ 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 ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
return;
if (c->active_profile != c->card->active_profile) { if (c->active_profile != c->card->active_profile) {
const char *object_path; const char *object_path;
@ -499,7 +501,6 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
signal = NULL; signal = NULL;
} }
} }
}
pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card) { pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card) {
pa_dbusiface_card *c = NULL; pa_dbusiface_card *c = NULL;

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

@ -268,13 +268,14 @@ 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;
@ -292,7 +293,6 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
signal = NULL; signal = NULL;
} }
} }
}
pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module) { pa_dbusiface_module *pa_dbusiface_module_new(pa_module *module) {
pa_dbusiface_module *m; pa_dbusiface_module *m;