summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-09-07 15:20:18 +0300
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-09-08 11:26:00 +0300
commit610704d225675d1d112cf1973bde9edb420ec37e (patch)
tree0eaa154f5b274ed708a655f056b32856b95afd36
parent293a1739e25707c25321d5bc6cd3e2e8aa96a910 (diff)
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.
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-headphones.conf1
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-lineout.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 89d794fbe..5222c2302 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 d5e24b118..40af69966 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