if ((description = pa_proplist_gets(data.proplist, PA_PROP_DEVICE_DESCRIPTION)))
pa_reserve_wrapper_set_application_device_name(reserve, description);
- data.profiles = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
add_profiles(u, data.profiles, data.ports);
if (pa_hashmap_isempty(data.profiles)) {
return -1;
}
- data.profiles = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
-
/* we base hsp/a2dp availability on UUIDs.
Ideally, it would be based on "Connected" state, but
we can't afford to wait for this information when
pa_assert(msg);
pa_assert(c);
- if (!c->active_profile) {
- 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;
- }
-
active_profile = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
-
pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &active_profile);
}
pa_assert(iter);
pa_assert(c);
- if (!c->active_profile) {
- 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;
- }
-
dbus_message_iter_get_basic(iter, &new_active_path);
if (!(new_active = pa_hashmap_get(c->profiles, new_active_path))) {
sinks = get_sinks(c, &n_sinks);
sources = get_sources(c, &n_sources);
profiles = get_profiles(c, &n_profiles);
- if (c->active_profile)
- active_profile = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
+ active_profile = pa_dbusiface_card_profile_get_path(pa_hashmap_get(c->profiles, c->active_profile->name));
pa_assert_se((reply = dbus_message_new_method_return(msg)));
pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SINKS].property_name, DBUS_TYPE_OBJECT_PATH, sinks, n_sinks);
pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SOURCES].property_name, DBUS_TYPE_OBJECT_PATH, sources, n_sources);
pa_dbus_append_basic_array_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROFILES].property_name, DBUS_TYPE_OBJECT_PATH, profiles, n_profiles);
-
- if (active_profile)
- pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ACTIVE_PROFILE].property_name, DBUS_TYPE_OBJECT_PATH, &active_profile);
+ pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_ACTIVE_PROFILE].property_name, DBUS_TYPE_OBJECT_PATH, &active_profile);
pa_dbus_append_proplist_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PROPERTY_LIST].property_name, c->proplist);
pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card) {
pa_dbusiface_card *c = NULL;
+ pa_card_profile *profile;
+ void *state;
pa_assert(core);
pa_assert(card);
c->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, card->index);
c->profiles = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
c->next_profile_index = 0;
- c->active_profile = NULL;
+ c->active_profile = card->active_profile;
c->proplist = pa_proplist_copy(card->proplist);
c->dbus_protocol = pa_dbus_protocol_get(card->core);
c->subscription = pa_subscription_new(card->core, PA_SUBSCRIPTION_MASK_CARD, subscription_cb, c);
- if (card->profiles) {
- pa_card_profile *profile;
- void *state = NULL;
-
- PA_HASHMAP_FOREACH(profile, card->profiles, state) {
- pa_dbusiface_card_profile *p = pa_dbusiface_card_profile_new(c, card->core, profile, c->next_profile_index++);
- pa_hashmap_put(c->profiles, pa_dbusiface_card_profile_get_name(p), p);
- }
- pa_assert_se(c->active_profile = card->active_profile);
+ PA_HASHMAP_FOREACH(profile, card->profiles, state) {
+ pa_dbusiface_card_profile *p = pa_dbusiface_card_profile_new(c, card->core, profile, c->next_profile_index++);
+ pa_hashmap_put(c->profiles, pa_dbusiface_card_profile_get_name(p), p);
}
pa_assert_se(pa_dbus_protocol_add_interface(c->dbus_protocol, c->path, &card_interface_info, c) >= 0);
return;
entry = entry_new();
- entry->profile = pa_xstrdup(card->active_profile ? card->active_profile->name : "");
+ entry->profile = pa_xstrdup(card->active_profile->name);
if ((old = entry_read(u, card->name))) {
if (best_profile && best_profile->priority >= profile->priority)
continue;
- if (!card->active_profile) {
- best_profile = profile;
- continue;
- }
/* We make a best effort to keep other direction unchanged */
if (!port->is_input) {
find_sink_and_source(card, port, &sink, &source);
- is_active_profile = port->profiles && card->active_profile &&
+ is_active_profile = port->profiles &&
card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name);
is_active_port = (sink && sink->active_port == port) || (source && source->active_port == port);
memset(data, 0, sizeof(*data));
data->proplist = pa_proplist_new();
+ data->profiles = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
data->ports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
return data;
}
pa_core_assert_ref(core);
pa_assert(data);
pa_assert(data->name);
+ pa_assert(data->profiles);
+ pa_assert(!pa_hashmap_isempty(data->profiles));
c = pa_xnew(pa_card, 1);
c->active_profile = NULL;
c->save_profile = FALSE;
- if (data->active_profile && c->profiles)
+ if (data->active_profile)
if ((c->active_profile = pa_hashmap_get(c->profiles, data->active_profile)))
c->save_profile = data->save_profile;
- if (!c->active_profile && c->profiles) {
+ if (!c->active_profile) {
void *state;
pa_card_profile *p;
int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save) {
pa_card_profile *profile;
int r;
+
pa_assert(c);
if (!c->set_profile) {
return -PA_ERR_NOTIMPLEMENTED;
}
- if (!c->profiles || !name)
+ if (!name)
return -PA_ERR_NOENTITY;
if (!(profile = pa_hashmap_get(c->profiles, name)))
nl = TRUE;
}
- if (card->active_profile)
- pa_strbuf_printf(buf, "set-card-profile %s %s\n", card->name, card->active_profile->name);
+ pa_strbuf_printf(buf, "set-card-profile %s %s\n", card->name, card->active_profile->name);
}
nl = FALSE;
pa_sink *sink;
pa_source *source;
uint32_t sidx;
+ pa_card_profile *profile;
+ void *state;
pa_strbuf_printf(
s,
pa_strbuf_printf(s, "\tproperties:\n\t\t%s\n", t);
pa_xfree(t);
- if (card->profiles) {
- pa_card_profile *p;
- void *state;
+ pa_strbuf_puts(s, "\tprofiles:\n");
+ PA_HASHMAP_FOREACH(profile, card->profiles, state)
+ pa_strbuf_printf(s, "\t\t%s: %s (priority %u)\n", profile->name, profile->description, profile->priority);
- pa_strbuf_puts(s, "\tprofiles:\n");
- PA_HASHMAP_FOREACH(p, card->profiles, state)
- pa_strbuf_printf(s, "\t\t%s: %s (priority %u)\n", p->name, p->description, p->priority);
- }
-
- if (card->active_profile)
- pa_strbuf_printf(
- s,
- "\tactive profile: <%s>\n",
- card->active_profile->name);
+ pa_strbuf_printf(
+ s,
+ "\tactive profile: <%s>\n",
+ card->active_profile->name);
if (!pa_idxset_isempty(card->sinks)) {
pa_strbuf_puts(s, "\tsinks:\n");
pa_tagstruct_putu32(t, card->module ? card->module->index : PA_INVALID_INDEX);
pa_tagstruct_puts(t, card->driver);
- pa_tagstruct_putu32(t, card->profiles ? pa_hashmap_size(card->profiles) : 0);
+ pa_tagstruct_putu32(t, pa_hashmap_size(card->profiles));
- if (card->profiles) {
- while ((p = pa_hashmap_iterate(card->profiles, &state, NULL))) {
- pa_tagstruct_puts(t, p->name);
- pa_tagstruct_puts(t, p->description);
- pa_tagstruct_putu32(t, p->n_sinks);
- pa_tagstruct_putu32(t, p->n_sources);
- pa_tagstruct_putu32(t, p->priority);
- }
+ PA_HASHMAP_FOREACH(p, card->profiles, state) {
+ pa_tagstruct_puts(t, p->name);
+ pa_tagstruct_puts(t, p->description);
+ pa_tagstruct_putu32(t, p->n_sinks);
+ pa_tagstruct_putu32(t, p->n_sources);
+ pa_tagstruct_putu32(t, p->priority);
}
- pa_tagstruct_puts(t, card->active_profile ? card->active_profile->name : NULL);
+ pa_tagstruct_puts(t, card->active_profile->name);
pa_tagstruct_put_proplist(t, card->proplist);
if (c->version < 26)