mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: update pcm proplist for UCM as well

Browse source 
Update the properties we get from the pcm handle right before we
close the handle.
Also set properties on the UCM devices.

See #524
This commit is contained in:
Wim Taymans 2021-01-11 15:39:48 +01:00
parent 24c7f45118
commit b3f8a4b99b
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/alsa/acp/alsa-mixer.c
View file

@ -4995,6 +4995,7 @@ static void profile_finalize_probing(pa_alsa_profile *to_be_finalized, pa_alsa_p
if (next && next->output_mappings && pa_idxset_get_by_data(next->output_mappings, m, NULL))
continue;
pa_alsa_init_proplist_pcm(NULL, m->output_proplist, m->output_pcm);
snd_pcm_close(m->output_pcm);
m->output_pcm = NULL;
}
@ -5014,6 +5015,7 @@ static void profile_finalize_probing(pa_alsa_profile *to_be_finalized, pa_alsa_p
if (next && next->input_mappings && pa_idxset_get_by_data(next->input_mappings, m, NULL))
continue;
pa_alsa_init_proplist_pcm(NULL, m->input_proplist, m->input_pcm);
snd_pcm_close(m->input_pcm);
m->input_pcm = NULL;
}
@ -5239,7 +5241,6 @@ void pa_alsa_profile_set_probe(
if (m->output_pcm) {
found_output |= !p->fallback_output;
mapping_paths_probe(m, p, PA_ALSA_DIRECTION_OUTPUT, used_paths, mixers);
pa_alsa_init_proplist_pcm(NULL, m->output_proplist, m->output_pcm);
}
if (p->input_mappings)
@ -5247,7 +5248,6 @@ void pa_alsa_profile_set_probe(
if (m->input_pcm) {
found_input |= !p->fallback_input;
mapping_paths_probe(m, p, PA_ALSA_DIRECTION_INPUT, used_paths, mixers);
pa_alsa_init_proplist_pcm(NULL, m->input_proplist, m->input_pcm);
}
}

2
spa/plugins/alsa/acp/alsa-ucm.c
View file

@ -1905,6 +1905,7 @@ static void profile_finalize_probing(pa_alsa_profile *p) {
if (!m->output_pcm)
continue;
pa_alsa_init_proplist_pcm(NULL, m->output_proplist, m->output_pcm);
snd_pcm_close(m->output_pcm);
m->output_pcm = NULL;
}
@ -1916,6 +1917,7 @@ static void profile_finalize_probing(pa_alsa_profile *p) {
if (!m->input_pcm)
continue;
pa_alsa_init_proplist_pcm(NULL, m->input_proplist, m->input_pcm);
snd_pcm_close(m->input_pcm);
m->input_pcm = NULL;
}