[pulseaudio-commits] 2 commits - src/modules

[David Henningsson]

 src/modules/alsa/alsa-mixer.c                   |    6 +++---
 src/modules/alsa/mixer/paths/hdmi-output-0.conf |    2 +-
 src/modules/alsa/mixer/paths/hdmi-output-1.conf |    2 +-
 src/modules/alsa/mixer/paths/hdmi-output-2.conf |    2 +-
 src/modules/alsa/mixer/paths/hdmi-output-3.conf |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f1a36e84a7360daced67749577b1d0872b600383
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Mar 26 10:45:52 2012 +0200

    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 at canonical.com>

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);
         }
 
     }

commit 2577cc81b3559b78ffeb5ee4a858e2c832c015b2
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Mar 26 10:31:47 2012 +0200

    alsa-mixer: Show HDMI ports for older Nvidia cards
    
    Some older cards do not have jack detection. This patch makes the
    port still show up.
    An implementation detail: the "required = ignore" line has in itself
    no effect, but we have to write *something* there, or else the entire
    jack detection section will be ignored by the parser.
    
    BugLink: https://bugs.launchpad.net/bugs/961286
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
index 46ee4fd..a86cdbd 100644
--- a/src/modules/alsa/mixer/paths/hdmi-output-0.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort
 priority = 59
 
 [Jack HDMI/DP,pcm=3]
-required-any = any
+required = ignore
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
index da8fcb4..d579e4b 100644
--- a/src/modules/alsa/mixer/paths/hdmi-output-1.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort 2
 priority = 58
 
 [Jack HDMI/DP,pcm=7]
-required-any = any
+required = ignore
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
index 5fcddc6..fee57d7 100644
--- a/src/modules/alsa/mixer/paths/hdmi-output-2.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort 3
 priority = 57
 
 [Jack HDMI/DP,pcm=8]
-required-any = any
+required = ignore
diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
index 8200787..4e6d149 100644
--- a/src/modules/alsa/mixer/paths/hdmi-output-3.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
@@ -3,4 +3,4 @@ description = HDMI / DisplayPort 4
 priority = 56
 
 [Jack HDMI/DP,pcm=9]
-required-any = any
+required = ignore