alsa: leave other headphone control enabled if possible

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
index d1c3b22bb85bb91cab5c3d548a19df257f325f2f..f2fd31c7fa6aafccfd99079993cc5eff98c023e5 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -37,9 +37,12 @@ override-map.2 = all-left,all-right
 switch = off
 volume = off
 
+; This profile path is intended to control the second headphones, not
+; the first headphones. But it should not hurt if we leave the
+; headphone jack enabled nonetheless.
 [Element Headphone]
-switch = off
-volume = off
+switch = mute
+volume = zero
 
 [Element Headphone2]
 required = any

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 6e79a78638912fe37ba4db41ad3ad019d762fdaf..2131cfe81e2f9a6481fff71ac2023d9cf98229d8 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -44,9 +44,12 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+; This profile path is intended to control the first headphones, not
+; the second headphones. But it should not hurt if we leave the second
+; headphone jack enabled nonetheless.
 [Element Headphone2]
-switch = off
-volume = off
+switch = mute
+volume = zero
 
 [Element Speaker]
 switch = off

diff --git a/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf b/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf
index 911361d7cd2d4b749db9172b6bcd158da3b3295c..0a43e2715fbac6d4fd043634f0a57cba37be9a89 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf
@@ -48,6 +48,10 @@ override-map.2 = lfe,lfe
 switch = mute
 volume = zero
 
+[Element Headphone2]
+switch = mute
+volume = zero
+
 [Element Speaker]
 switch = mute
 volume = merge

diff --git a/src/modules/alsa/mixer/paths/analog-output-mono.conf b/src/modules/alsa/mixer/paths/analog-output-mono.conf
index 2fbc60b74f38de1cefbdd0441b2647f00c14a4f1..542edc401d177e00a7c743917514f407aa7441e5 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-mono.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-mono.conf
@@ -45,6 +45,10 @@ override-map.2 = all-left,all-right
 switch = mute
 volume = zero
 
+[Element Headphone2]
+switch = mute
+volume = zero
+
 [Element Speaker]
 switch = mute
 volume = merge

diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index f71a05a1d199a832bc295d9ea92babbd6e477d36..b10efc209ea9989fcb5fd2da67429d237357fbee 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -44,6 +44,10 @@ volume = off
 switch = mute
 volume = zero
 
+[Element Headphone2]
+switch = mute
+volume = zero
+
 [Element Speaker]
 switch = mute
 volume = merge