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

Pass the profile object instead of the profile name to pa_card_set_profile()

Browse source 
When setting attribute foo, or in this case the card profile, in my
opinion the thing passed to the set_foo() function should be of the
type of foo, not a string identifier that can be used to search for
the actual foo in set_foo().

This is mostly a question of taste, but there's at least some small
benefit from passing the actual object: often the profile object is
already available when calling pa_card_set_profile(), so passing the
card name would cause unnecessary searching when pa_card_set_profile()
needs to look up the profile from the hashmap.
This commit is contained in:
Tanu Kaskinen 2013-11-20 15:42:26 +02:00
parent bee86af3cc
commit ce304d6208
12 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/bluetooth/module-bluetooth-policy.c
View file

@ -195,7 +195,7 @@ static pa_hook_result_t profile_available_hook_callback(pa_core *c, pa_card_prof
pa_log_debug("Setting card '%s' to profile '%s'", card->name, selected_profile->name);
if (pa_card_set_profile(card, selected_profile->name, false) != 0)
if (pa_card_set_profile(card, selected_profile, false) != 0)
pa_log_warn("Could not set profile '%s'", selected_profile->name);
return PA_HOOK_OK;

8
src/modules/bluetooth/module-bluez4-device.c
View file

@ -543,7 +543,7 @@ static int device_process_msg(pa_msgobject *obj, int code, void *data, int64_t o
pa_log_debug("Switching the profile to off due to IO thread failure.");
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
break;
}
}
@ -1815,7 +1815,7 @@ static pa_hook_result_t transport_state_changed_cb(pa_bluez4_discovery *y, pa_bl
pa_assert(u);
if (t == u->transport && t->state == PA_BLUEZ4_TRANSPORT_STATE_DISCONNECTED)
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
if (t->device == u->device)
handle_transport_state_change(u, t);
@ -2060,7 +2060,7 @@ static int card_set_profile(pa_card *c, pa_card_profile *new_profile) {
off:
stop_thread(u);
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
return -PA_ERR_IO;
}
@ -2537,7 +2537,7 @@ int pa__init(pa_module *m) {
off:
stop_thread(u);
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
return 0;

8
src/modules/bluetooth/module-bluez5-device.c
View file

@ -1588,7 +1588,7 @@ static int set_profile_cb(pa_card *c, pa_card_profile *new_profile) {
off:
stop_thread(u);
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
return -PA_ERR_IO;
}
@ -1757,7 +1757,7 @@ static pa_hook_result_t transport_state_changed_cb(pa_bluetooth_discovery *y, pa
pa_assert(u);
if (t == u->transport && t->state <= PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED)
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
if (t->device == u->device)
handle_transport_state_change(u, t);
@ -1775,7 +1775,7 @@ static int device_process_msg(pa_msgobject *obj, int code, void *data, int64_t o
break;
pa_log_debug("Switching the profile to off due to IO thread failure.");
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
break;
}
@ -1847,7 +1847,7 @@ int pa__init(pa_module* m) {
off:
stop_thread(u);
pa_assert_se(pa_card_set_profile(u->card, "off", false) >= 0);
pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0);
return 0;

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

@ -226,3 +226,9 @@ const char *pa_dbusiface_card_profile_get_name(pa_dbusiface_card_profile *p) {
return p->profile->name;
}
pa_card_profile *pa_dbusiface_card_profile_get_profile(pa_dbusiface_card_profile *p) {
pa_assert(p);
return p->profile;
}

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

@ -45,5 +45,6 @@ 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_name(pa_dbusiface_card_profile *p);
pa_card_profile *pa_dbusiface_card_profile_get_profile(pa_dbusiface_card_profile *p);
#endif

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

@ -336,7 +336,7 @@ static void handle_set_active_profile(DBusConnection *conn, DBusMessage *msg, DB
return;
}
if ((r = pa_card_set_profile(c->card, pa_dbusiface_card_profile_get_name(new_active), true)) < 0) {
if ((r = pa_card_set_profile(c->card, pa_dbusiface_card_profile_get_profile(new_active), true)) < 0) {
pa_dbus_send_error(conn, msg, DBUS_ERROR_FAILED,
"Internal error in PulseAudio: pa_card_set_profile() failed with error code %i.", r);
return;

2
src/modules/module-card-restore.c
View file

@ -413,7 +413,7 @@ static pa_hook_result_t card_profile_added_callback(pa_core *c, pa_card_profile
return PA_HOOK_OK;
if (pa_safe_streq(entry->profile, profile->name)) {
if (pa_card_set_profile(profile->card, profile->name, true) >= 0)
if (pa_card_set_profile(profile->card, profile, true) >= 0)
pa_log_info("Restored profile '%s' for card %s.", profile->name, profile->card->name);
}

2
src/modules/module-switch-on-port-available.c
View file

@ -121,7 +121,7 @@ static int try_to_switch_profile(pa_device_port *port) {
return -1;
}
if (pa_card_set_profile(port->card, best_profile->name, false) != 0) {
if (pa_card_set_profile(port->card, best_profile, false) != 0) {
pa_log_debug("Could not set profile %s", best_profile->name);
return -1;
}