[pulseaudio-commits] src/modules

[Tanu Kaskinen]

 src/modules/alsa/mixer/paths/analog-output-headphones.conf |    1 +
 src/modules/alsa/mixer/paths/analog-output-lineout.conf    |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 610704d225675d1d112cf1973bde9edb420ec37e
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Sun Sep 7 15:20:18 2014 +0300

    alsa-mixer: Mark "Line HP Swap" as required-any
    
    In the (theoretical) case that no other elements exists but
    "Line HP Swap", the presence of that element signals that there are
    headphone and line-out outputs, otherwise there would be nothing to
    swap.

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 89d794f..5222c23 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -77,6 +77,7 @@ override-map.2 = all-left,all-right
 
 [Element Line HP Swap]
 switch = on
+required-any = any
 
 ; This profile path is intended to control the first headphones, not
 ; the second headphones. But it should not hurt if we leave the second
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index d5e24b1..40af699 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -82,6 +82,7 @@ volume = off
 
 [Element Line HP Swap]
 switch = off
+required-any = any
 
 ; This profile path is intended to control the default output, not the
 ; headphones. But it should not hurt if we leave the headphone jack