diff options
author | David Henningsson <david.henningsson@canonical.com> | 2012-03-26 10:45:52 +0200 |
---|---|---|
committer | David Henningsson <david.henningsson@canonical.com> | 2012-03-26 10:45:52 +0200 |
commit | f1a36e84a7360daced67749577b1d0872b600383 (patch) | |
tree | c1778ac0414efc914202b299e7c8f9e778e93719 /src | |
parent | 2577cc81b3559b78ffeb5ee4a858e2c832c015b2 (diff) |
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 <david.henningsson@canonical.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/alsa/alsa-mixer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 2e768e99..ba31c79d 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); } } |