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

dbusiface-card: Split some overly long lines.

Browse source
This commit is contained in:
Tanu Kaskinen 2009-08-15 05:51:55 +03:00
parent 31117fe99e
commit 8b5550dba3
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/dbus/iface-card-profile.c
View file

@ -182,7 +182,11 @@ static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdat
dbus_message_unref(reply); dbus_message_unref(reply);
} }
pa_dbusiface_card_profile *pa_dbusiface_card_profile_new(pa_dbusiface_card *card, pa_core *core, pa_card_profile *profile, uint32_t idx) { pa_dbusiface_card_profile *pa_dbusiface_card_profile_new(
pa_dbusiface_card *card,
pa_core *core,
pa_card_profile *profile,
uint32_t idx) {
pa_dbusiface_card_profile *p = NULL; pa_dbusiface_card_profile *p = NULL;
pa_assert(card); pa_assert(card);

6
src/modules/dbus/iface-card-profile.h
View file

@ -37,7 +37,11 @@
typedef struct pa_dbusiface_card_profile pa_dbusiface_card_profile; typedef struct pa_dbusiface_card_profile pa_dbusiface_card_profile;
pa_dbusiface_card_profile *pa_dbusiface_card_profile_new(pa_dbusiface_card *card, pa_core *core, pa_card_profile *profile, uint32_t idx); pa_dbusiface_card_profile *pa_dbusiface_card_profile_new(
pa_dbusiface_card *card,
pa_core *core,
pa_card_profile *profile,
uint32_t idx);
void pa_dbusiface_card_profile_free(pa_dbusiface_card_profile *p); void pa_dbusiface_card_profile_free(pa_dbusiface_card_profile *p);
const char *pa_dbusiface_card_profile_get_path(pa_dbusiface_card_profile *p); const char *pa_dbusiface_card_profile_get_path(pa_dbusiface_card_profile *p);

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

@ -312,7 +312,10 @@ static void handle_get_active_profile(DBusConnection *conn, DBusMessage *msg, vo
pa_assert(c); pa_assert(c);
if (!c->active_profile) { if (!c->active_profile) {
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY, "The card %s has no profiles, and therefore there's no active profile either.", c->card->name); pa_assert(pa_hashmap_isempty(c->profiles));
pa_dbus_send_error(conn, msg, PA_DBUS_ERROR_NO_SUCH_PROPERTY,
"The card %s has no profiles, and therefore there's no active profile either.", c->card->name);
return; return;
} }
@ -470,7 +473,9 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
c->active_profile = c->card->active_profile; c->active_profile = c->card->active_profile;
object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name)); object_path = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
pa_assert_se(signal = dbus_message_new_signal(c->path, PA_DBUSIFACE_CARD_INTERFACE, signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name)); pa_assert_se(signal = dbus_message_new_signal(c->path,
PA_DBUSIFACE_CARD_INTERFACE,
signals[SIGNAL_ACTIVE_PROFILE_UPDATED].name));
pa_assert_se(dbus_message_append_args(signal, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID)); 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_dbus_protocol_send_signal(c->dbus_protocol, signal);
@ -483,7 +488,9 @@ static void subscription_cb(pa_core *core, pa_subscription_event_type_t t, uint3
pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist); pa_proplist_update(c->proplist, PA_UPDATE_SET, c->card->proplist);
pa_assert_se(signal = dbus_message_new_signal(c->path, PA_DBUSIFACE_CARD_INTERFACE, signals[SIGNAL_PROPERTY_LIST_UPDATED].name)); pa_assert_se(signal = dbus_message_new_signal(c->path,
PA_DBUSIFACE_CARD_INTERFACE,
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, c->proplist); pa_dbus_append_proplist(&msg_iter, c->proplist);