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

[David Henningsson]

 src/modules/alsa/mixer/paths/analog-input-headset-mic.conf |    7 +++++++
 src/modules/alsa/mixer/paths/analog-output-headphones.conf |    7 +++++++
 2 files changed, 14 insertions(+)

New commits:
commit 6eecb2f3f3cca6286b3f85751b2a74a227394836
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Mon Mar 25 14:56:05 2013 +0100

    alsa-mixer: Add "Headset Playback|Capture" element
    
    Found on Logitech B530 USB Headset / kernel 3.8. Because we don't
    have different path for headset and headphone today, just add
    Headset to the existing headphone path.
    
    BugLink: https://bugs.launchpad.net/bugs/1159687
    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 0310ccb..6be2c95 100644
--- a/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-headset-mic.conf
@@ -44,6 +44,13 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+[Element Headset]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Capture]
 switch = mute
 volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 4266d11..e876768 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -69,6 +69,13 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+[Element Headset]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Line HP Swap]
 switch = on