summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-03-25 14:56:05 +0100
committerDavid Henningsson <david.henningsson@canonical.com>2013-04-04 11:52:24 +0200
commita6bc3b8ca9ba822c97680925e33ac42bd5c54653 (patch)
tree12e16d8f187c626b5a5700831c0fa8a16aa53c88
parent25d8de9f0b788865cc966be709cb9ca815e6e4d7 (diff)
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@canonical.com>
-rw-r--r--src/modules/alsa/mixer/paths/analog-input-headset-mic.conf7
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-headphones.conf7
2 files changed, 14 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 c5aff1c4..810c85f7 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 b878dc70..29358e76 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