summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-04-12 11:56:17 +0200
committerArun Raghavan <arun.raghavan@collabora.co.uk>2013-04-14 10:12:38 +0530
commit6140191f2701609bccbbbbb31cca58e3b9599a1d (patch)
tree04c287076c0c2b15de86212f24d70a54ea42b8e3
parent4126535e0eddbfc4c4b7813acdd72ba07848baa6 (diff)
alsa-mixer: Add more jack detection for Headset mic path
On some machines which has a headset jack, the headset mic does not have its own jack detection. Then we can look at the headphone jack to get some indication: We know that if the headphone is unplugged, so is the headset mic. The opposite is not guaranteed since the user might have plugged in a headphone, not a headset. Also, there exist multi-function jacks which support both Headphone, Mic in headphone jack and Headset Mic. In this case the jack name will be "Headphone Mic", not "Headphone", so we need to include this name too. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r--src/modules/alsa/mixer/paths/analog-input-headset-mic.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
index 6be2c95f..0a3d661f 100644
--- a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
@@ -30,6 +30,12 @@ state.plugged = unknown
state.unplugged = unknown
required-any = any
+[Jack Headphone]
+state.plugged = unknown
+
+[Jack Headphone Mic]
+state.plugged = unknown
+
[Element Headset Mic Boost]
required-any = any
switch = select