From 8a26fbf863d0c4f13cf56f28ba779a50e7335671 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 31 Oct 2009 03:42:42 +0100
Subject: alsa: leave other headphone control enabled if possible

---
 src/modules/alsa/mixer/paths/analog-output-headphones-2.conf | 7 +++++--
 src/modules/alsa/mixer/paths/analog-output-headphones.conf   | 7 +++++--
 src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf  | 4 ++++
 src/modules/alsa/mixer/paths/analog-output-mono.conf         | 4 ++++
 src/modules/alsa/mixer/paths/analog-output.conf              | 4 ++++
 5 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'src')

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 d1c3b22b..f2fd31c7 100644
--- 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 6e79a786..2131cfe8 100644
--- 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 911361d7..0a43e271 100644
--- 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 2fbc60b7..542edc40 100644
--- 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 f71a05a1..b10efc20 100644
--- 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
-- 
cgit