summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2020-06-06 17:00:01 +0300
committerPulseAudio Marge Bot <pulseaudio-maintainers@lists.freedesktop.org>2020-12-14 19:31:28 +0000
commite3f2c25face8f964827f75dbc8fd766fc02aaf6d (patch)
tree8750dc2fd53641d7ad1880232fa35a585c2ca046
parent9b0ae8327d990584bb9a966d8d7bee6badbdb8c0 (diff)
alsa-mixer: Pick at most one fallback mapping
The old behaviour was such that if none of the normal mappings worked, we would probe ALL fallbacks. I don't think that makes sense, and it caused concrete issues: let's say we have a regular stereo mic device, but there's no "front" PCM defined for it. In this situation we would probe the stereo-fallback mapping (which uses "hw" instead of "front"), and it would work, but then we'd also probe the "multichannel-input" mapping, which would also work, so we end up with two mappings that don't have any difference in behaviour. I think it's better to simply pick the first working fallback and ignore the rest. Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/901 (issue is marked as confidential due to unreleased hardware) Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/304>
-rw-r--r--src/modules/alsa/alsa-mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index c40629712..8b9ccfbf6 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -5155,14 +5155,14 @@ void pa_alsa_profile_set_probe(
if (p->output_mappings)
PA_IDXSET_FOREACH(m, p->output_mappings, idx)
if (m->output_pcm) {
- found_output |= !p->fallback_output;
+ found_output = true;
mapping_paths_probe(m, p, PA_ALSA_DIRECTION_OUTPUT, used_paths, mixers);
}
if (p->input_mappings)
PA_IDXSET_FOREACH(m, p->input_mappings, idx)
if (m->input_pcm) {
- found_input |= !p->fallback_input;
+ found_input = true;
mapping_paths_probe(m, p, PA_ALSA_DIRECTION_INPUT, used_paths, mixers);
}
}