From c1f3f7709fd729aedffd7c1d8c5d71c70dae0405 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Fri, 2 Dec 2011 10:20:23 +0100 Subject: [PATCH] Fixup a few things in the new path probing * If mapping_probe_paths() fails to open the mixer, all paths are now removed from the mapping's path sets. * pa_path_set.probed isn't really used for anything (removed). * If profile probing is configured to be skipped, mapping_paths_probe() should still be called. Thanks to Tanu for spotting. Signed-off-by: David Henningsson --- src/modules/alsa/alsa-mixer.c | 17 ++++++++++------- src/modules/alsa/alsa-mixer.h | 1 - 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 6a909ea..36f3351 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -2903,10 +2903,9 @@ void pa_alsa_path_set_dump(pa_alsa_path_set *ps) { void *state; pa_assert(ps); - pa_log_debug("Path Set %p, direction=%i, probed=%s", + pa_log_debug("Path Set %p, direction=%i", (void*) ps, - ps->direction, - pa_yes_no(ps->probed)); + ps->direction); PA_HASHMAP_FOREACH(p, ps->paths, state) pa_alsa_path_dump(p); @@ -3726,8 +3725,12 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile, pa_assert(pcm_handle); mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL); - if (!mixer_handle) - return; /* Cannot open mixer :-( */ + if (!mixer_handle) { + /* Cannot open mixer, remove all entries */ + while (pa_hashmap_steal_first(ps->paths)); + return; + } + PA_HASHMAP_FOREACH(p, ps->paths, state) { if (pa_alsa_path_probe(p, mixer_handle, m->profile_set->ignore_dB) < 0) { @@ -3737,7 +3740,6 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile, path_set_condense(ps, mixer_handle); path_set_make_paths_unique(ps); - ps->probed = TRUE; if (mixer_handle) snd_mixer_close(mixer_handle); @@ -4175,7 +4177,7 @@ void pa_alsa_profile_set_probe( /* Is this already marked that it is supported? (i.e. from the config file) */ if (p->supported) - continue; + goto probe_paths; pa_log_debug("Looking at profile %s", p->name); @@ -4276,6 +4278,7 @@ void pa_alsa_profile_set_probe( if (!p->supported) continue; +probe_paths: pa_log_debug("Profile %s supported.", p->name); if (p->output_mappings) diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h index c0a746c..aa340b9 100644 --- a/src/modules/alsa/alsa-mixer.h +++ b/src/modules/alsa/alsa-mixer.h @@ -191,7 +191,6 @@ struct pa_alsa_path { struct pa_alsa_path_set { pa_hashmap *paths; pa_alsa_direction_t direction; - pa_bool_t probed:1; }; int pa_alsa_setting_select(pa_alsa_setting *s, snd_mixer_t *m); -- 2.7.4