[pulseaudio-commits] src/modules

[David Henningsson]

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

New commits:
commit 00922f7dc0b6b63325193b58721c2e910b7d4489
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Mar 11 05:50:10 2014 +0100

    alsa-mixer: Fix Analog Input showing up on USB Headset
    
    In some cases, "Analog Input" could show up as well as
    "Headset Mic" (or "Headphone Mic"), because I forgot to add the
    relevant "required-absent" lines when I added the headset mic path.
    
    As a result, both "Analog Input" and "Headset Mic" showed up on the
    Logitech USB 530 Headset.
    
    Reported-by: Steve Magoun <steve.magoun at canonical.com>
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf
index c8f8e3c..356b07c 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf
+++ b/src/modules/alsa/mixer/paths/analog-input.conf
@@ -61,6 +61,21 @@ required-absent = any
 [Element Rear Mic Boost]
 required-absent = any
 
+[Element Headset]
+required-absent = any
+
+[Element Headset Mic]
+required-absent = any
+
+[Element Headset Mic Boost]
+required-absent = any
+
+[Element Headphone Mic]
+required-absent = any
+
+[Element Headphone Mic Boost]
+required-absent = any
+
 [Element Line]
 required-absent = any