data->name = pa_xstrdup(name);
}
-void pa_card_add_profile(pa_card *c, pa_card_profile *profile) {
- pa_assert(c);
- pa_assert(profile);
-
- /* take ownership of the profile */
- pa_assert_se(pa_hashmap_put(c->profiles, profile->name, profile) >= 0);
- profile->card = c;
-
- pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
-
- pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], profile);
-}
-
void pa_card_new_data_set_profile(pa_card_new_data *data, const char *profile) {
pa_assert(data);
c->save_profile = data->save_profile;
if (!c->active_profile) {
- PA_HASHMAP_FOREACH(profile, c->profiles, state)
+ PA_HASHMAP_FOREACH(profile, c->profiles, state) {
+ if (profile->available == PA_AVAILABLE_NO)
+ continue;
+
if (!c->active_profile || profile->priority > c->active_profile->priority)
c->active_profile = profile;
+ }
+ /* If all profiles are not available, then we still need to pick one */
+ if (!c->active_profile) {
+ PA_HASHMAP_FOREACH(profile, c->profiles, state)
+ if (!c->active_profile || profile->priority > c->active_profile->priority)
+ c->active_profile = profile;
+ }
+ pa_assert(c->active_profile);
}
c->userdata = NULL;
c->set_profile = NULL;
- pa_device_init_description(c->proplist);
+ pa_device_init_description(c->proplist, c);
pa_device_init_icon(c->proplist, true);
pa_device_init_intended_roles(c->proplist);
pa_xfree(c);
}
-int pa_card_set_profile(pa_card *c, const char *name, bool save) {
- pa_card_profile *profile;
+void pa_card_add_profile(pa_card *c, pa_card_profile *profile) {
+ pa_assert(c);
+ pa_assert(profile);
+
+ /* take ownership of the profile */
+ pa_assert_se(pa_hashmap_put(c->profiles, profile->name, profile) >= 0);
+ profile->card = c;
+
+ pa_subscription_post(c->core, PA_SUBSCRIPTION_EVENT_CARD|PA_SUBSCRIPTION_EVENT_CHANGE, c->index);
+
+ pa_hook_fire(&c->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], 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;