From f1a36e84a7360daced67749577b1d0872b600383 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Mon, 26 Mar 2012 10:45:52 +0200 Subject: [PATCH] alsa-mixer: Fix a small issue when detecting required-any If somebody writes the line "required-any=ignore", that shouldn't mean a required-any element needs to be present for the path to succeed probing. Signed-off-by: David Henningsson --- src/modules/alsa/alsa-mixer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 2e768e9..ba31c79 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -1999,15 +1999,15 @@ static int element_parse_required( else if (pa_streq(lvalue, "required-any")) { if (e) { e->required_any = req; - e->path->has_req_any = TRUE; + e->path->has_req_any |= (req != PA_ALSA_REQUIRED_IGNORE); } if (o) { o->required_any = req; - o->element->path->has_req_any = TRUE; + o->element->path->has_req_any |= (req != PA_ALSA_REQUIRED_IGNORE); } if (j) { j->required_any = req; - j->path->has_req_any = TRUE; + j->path->has_req_any |= (req != PA_ALSA_REQUIRED_IGNORE); } } -- 2.7.4