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

alsa-mixer: Set availability groups once per card

Browse source 
Previously they were set once per mapping, which caused the numbering to
restart from 1 for every mapping, so ports were incorrectly assigned to
the same group.
This commit is contained in:
Tanu Kaskinen 2020-10-04 13:00:58 +03:00 • committed by Arun Raghavan
parent a9c6d43b7c
commit eee8292ae1
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/modules/alsa/alsa-mixer.c
View file

@ -4276,22 +4276,36 @@ fail:
} }
/* the logic is simple: if we see the jack in multiple paths */ /* the logic is simple: if we see the jack in multiple paths */
/* assign all those jacks to one availability_group */ /* assign all those paths to one availability_group */
static void mapping_group_available(pa_hashmap *paths) static void profile_set_set_availability_groups(pa_alsa_profile_set *ps) {
{ pa_dynarray *paths;
void *state, *state2; pa_alsa_path *p;
pa_alsa_path *p, *p2; void *state;
pa_alsa_jack *j, *j2; unsigned idx1;
uint32_t num = 1; uint32_t num = 1;
PA_HASHMAP_FOREACH(p, paths, state) { /* Merge ps->input_paths and ps->output_paths into one dynarray. */
paths = pa_dynarray_new(NULL);
PA_HASHMAP_FOREACH(p, ps->input_paths, state)
pa_dynarray_append(paths, p);
PA_HASHMAP_FOREACH(p, ps->output_paths, state)
pa_dynarray_append(paths, p);
PA_DYNARRAY_FOREACH(p, paths, idx1) {
pa_alsa_jack *j;
const char *found = NULL; const char *found = NULL;
bool has_control = false; bool has_control = false;
PA_LLIST_FOREACH(j, p->jacks) { PA_LLIST_FOREACH(j, p->jacks) {
pa_alsa_path *p2;
unsigned idx2;
if (!j->has_control || j->state_plugged == PA_AVAILABLE_NO) if (!j->has_control || j->state_plugged == PA_AVAILABLE_NO)
continue; continue;
has_control = true; has_control = true;
PA_HASHMAP_FOREACH(p2, paths, state2) { PA_DYNARRAY_FOREACH(p2, paths, idx2) {
pa_alsa_jack *j2;
if (p2 == p) if (p2 == p)
break; break;
PA_LLIST_FOREACH(j2, p2->jacks) { PA_LLIST_FOREACH(j2, p2->jacks) {
@ -4318,6 +4332,8 @@ static void mapping_group_available(pa_hashmap *paths)
if (!found) if (!found)
num++; num++;
} }
pa_dynarray_free(paths);
} }
static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile, static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
@ -4368,8 +4384,6 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
PA_HASHMAP_FOREACH(p, ps->paths, state) PA_HASHMAP_FOREACH(p, ps->paths, state)
pa_hashmap_put(used_paths, p, p); pa_hashmap_put(used_paths, p, p);
mapping_group_available(ps->paths);
pa_log_debug("Available mixer paths (after tidying):"); pa_log_debug("Available mixer paths (after tidying):");
pa_alsa_path_set_dump(ps); pa_alsa_path_set_dump(ps);
} }
@ -5103,6 +5117,8 @@ void pa_alsa_profile_set_probe(
pa_hashmap_free(used_paths); pa_hashmap_free(used_paths);
pa_xfree(probe_order); pa_xfree(probe_order);
profile_set_set_availability_groups(ps);
ps->probed = true; ps->probed = true;
} }