mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04: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:16:45 +02:00
parent c2c8475f0d
commit 37429cb07e
11 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -537,7 +537,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;
}
}
@ -1809,7 +1809,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);
@ -2054,7 +2054,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;
}
@ -2563,7 +2563,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;

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;

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;
}

11
src/pulsecore/card.c
View file

@ -250,23 +250,18 @@ void pa_card_free(pa_card *c) {
pa_xfree(c);
}
int pa_card_set_profile(pa_card *c, const char *name, bool save) {
pa_card_profile *profile;
int pa_card_set_profile(pa_card *c, pa_card_profile *profile, bool save) {
int r;
pa_assert(c);
pa_assert(profile);
pa_assert(profile->card == c);
if (!c->set_profile) {
pa_log_debug("set_profile() operation not implemented for card %u \"%s\"", c->index, c->name);
return -PA_ERR_NOTIMPLEMENTED;
}
if (!name)
return -PA_ERR_NOENTITY;
if (!(profile = pa_hashmap_get(c->profiles, name)))
return -PA_ERR_NOENTITY;
if (c->active_profile == profile) {
c->save_profile = c->save_profile || save;
return 0;

2
src/pulsecore/card.h
View file

@ -115,7 +115,7 @@ void pa_card_free(pa_card *c);
void pa_card_add_profile(pa_card *c, pa_card_profile *profile);
int pa_card_set_profile(pa_card *c, const char *name, bool save);
int pa_card_set_profile(pa_card *c, pa_card_profile *profile, bool save);
int pa_card_suspend(pa_card *c, bool suspend, pa_suspend_cause_t cause);

8
src/pulsecore/cli-command.c
View file

@ -1634,6 +1634,7 @@ static int pa_cli_command_log_backtrace(pa_core *c, pa_tokenizer *t, pa_strbuf *
static int pa_cli_command_card_profile(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, bool *fail) {
const char *n, *p;
pa_card *card;
pa_card_profile *profile;
pa_core_assert_ref(c);
pa_assert(t);
@ -1655,7 +1656,12 @@ static int pa_cli_command_card_profile(pa_core *c, pa_tokenizer *t, pa_strbuf *b
return -1;
}
if (pa_card_set_profile(card, p, true) < 0) {
if (!(profile = pa_hashmap_get(card->profiles, p))) {
pa_strbuf_printf(buf, "No such profile: %s\n", p);
return -1;
}
if (pa_card_set_profile(card, profile, true) < 0) {
pa_strbuf_printf(buf, "Failed to set card profile to '%s'.\n", p);
return -1;
}

10
src/pulsecore/protocol-native.c
View file

@ -4702,8 +4702,9 @@ static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag,
static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
pa_native_connection *c = PA_NATIVE_CONNECTION(userdata);
uint32_t idx = PA_INVALID_INDEX;
const char *name = NULL, *profile = NULL;
const char *name = NULL, *profile_name = NULL;
pa_card *card = NULL;
pa_card_profile *profile;
int ret;
pa_native_connection_assert_ref(c);
@ -4711,7 +4712,7 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_
if (pa_tagstruct_getu32(t, &idx) < 0 ||
pa_tagstruct_gets(t, &name) < 0 ||
pa_tagstruct_gets(t, &profile) < 0 ||
pa_tagstruct_gets(t, &profile_name) < 0 ||
!pa_tagstruct_eof(t)) {
protocol_error(c);
return;
@ -4722,6 +4723,7 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_
CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID);
CHECK_VALIDITY(c->pstream, profile_name, tag, PA_ERR_INVALID);
if (idx != PA_INVALID_INDEX)
card = pa_idxset_get_by_index(c->protocol->core->cards, idx);
@ -4730,6 +4732,10 @@ static void command_set_card_profile(pa_pdispatch *pd, uint32_t command, uint32_
CHECK_VALIDITY(c->pstream, card, tag, PA_ERR_NOENTITY);
profile = pa_hashmap_get(card->profiles, profile_name);
CHECK_VALIDITY(c->pstream, profile, tag, PA_ERR_NOENTITY);
if ((ret = pa_card_set_profile(card, profile, true)) < 0) {
pa_pstream_send_error(c->pstream, tag, -ret);
return;