[pulseaudio-commits] Branch 'next' - src/modules

[Arun Raghavan]

 src/modules/alsa/mixer/paths/analog-input-headset-mic.conf |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 6140191f2701609bccbbbbb31cca58e3b9599a1d
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Fri Apr 12 11:56:17 2013 +0200

    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 at canonical.com>

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 6be2c95..0a3d661 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