From: Tanu Kaskinen Date: Sat, 6 Jun 2020 14:00:01 +0000 (+0300) Subject: alsa-mixer: Pick at most one fallback mapping X-Git-Tag: v14.99.1~250 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3f2c25face8f964827f75dbc8fd766fc02aaf6d;p=platform%2Fupstream%2Fpulseaudio.git 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: --- diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index c406297..8b9ccfb 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); } }