|
 |
4bc40d |
From 725b1cdc0b58b4015a7dd5526f05a9d1b2d458cf Mon Sep 17 00:00:00 2001
|
|
|
4bc40d |
From: David Henningsson <david.henningsson@canonical.com>
|
|
|
4bc40d |
Date: Fri, 12 Apr 2013 11:56:17 +0200
|
|
|
4bc40d |
Subject: [PATCH 2/2] alsa-mixer: Add more jack detection for Headset mic path
|
|
|
4bc40d |
|
|
|
4bc40d |
On some machines which has a headset jack, the headset mic does not have its own
|
|
|
4bc40d |
jack detection. Then we can look at the headphone jack to get some indication:
|
|
|
4bc40d |
We know that if the headphone is unplugged, so is the headset mic. The opposite
|
|
|
4bc40d |
is not guaranteed since the user might have plugged in a headphone, not a headset.
|
|
|
4bc40d |
|
|
|
4bc40d |
Also, there exist multi-function jacks which support both Headphone, Mic in headphone jack
|
|
|
4bc40d |
and Headset Mic. In this case the jack name will be "Headphone Mic", not "Headphone", so
|
|
|
4bc40d |
we need to include this name too.
|
|
|
4bc40d |
|
|
|
4bc40d |
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
|
|
4bc40d |
---
|
|
|
4bc40d |
src/modules/alsa/mixer/paths/analog-input-headset-mic.conf | 6 ++++++
|
|
|
4bc40d |
1 file changed, 6 insertions(+)
|
|
|
4bc40d |
|
|
|
4bc40d |
diff --git a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
|
|
|
4bc40d |
index c5aff1c..83f7d29 100644
|
|
|
4bc40d |
--- a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
|
|
|
4bc40d |
+++ b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
|
|
|
4bc40d |
@@ -30,6 +30,12 @@ state.plugged = unknown
|
|
|
4bc40d |
state.unplugged = unknown
|
|
|
4bc40d |
required-any = any
|
|
|
4bc40d |
|
|
|
4bc40d |
+[Jack Headphone]
|
|
|
4bc40d |
+state.plugged = unknown
|
|
|
4bc40d |
+
|
|
|
4bc40d |
+[Jack Headphone Mic]
|
|
|
4bc40d |
+state.plugged = unknown
|
|
|
4bc40d |
+
|
|
|
4bc40d |
[Element Headset Mic Boost]
|
|
|
4bc40d |
required-any = any
|
|
|
4bc40d |
switch = select
|
|
|
4bc40d |
--
|
|
|
4bc40d |
1.8.5.3
|
|
|
4bc40d |
|