summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-11-09 06:10:24 (GMT)
committerDavid Henningsson <david.henningsson@canonical.com>2012-11-14 12:14:08 (GMT)
commit387681d4179e3ac9ebeafef2cc8a4ab0a91f58f5 (patch)
tree38384a1eb47b5d89b5c08c99ab3e528d81a8e0a8
parentead5447231a913fe5fece6eff932626b2031641e (diff)
downloadpulseaudio-387681d4179e3ac9ebeafef2cc8a4ab0a91f58f5.tar.gz
pulseaudio-387681d4179e3ac9ebeafef2cc8a4ab0a91f58f5.tar.xz
alsa-mixer: Add "CLFE" and "Bass Speaker" names
These are sometimes being used in the HDA driver and we should support them. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker-always.conf13
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker.conf13
-rw-r--r--src/modules/alsa/mixer/paths/analog-output.conf6
3 files changed, 32 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index ba4cd5c..14d67b0 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -124,4 +124,17 @@ volume = merge
override-map.1 = lfe
override-map.2 = lfe,lfe
+[Element Bass Speaker]
+switch = mute
+volume = merge
+override-map.1 = lfe
+override-map.2 = lfe,lfe
+required-any = any
+
+[Element CLFE]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,lfe
+
.include analog-output.conf.common
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index 7540315..a7e3c4c 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -137,4 +137,17 @@ override-map.1 = lfe
override-map.2 = lfe,lfe
required-any = any
+[Element Bass Speaker]
+switch = mute
+volume = merge
+override-map.1 = lfe
+override-map.2 = lfe,lfe
+required-any = any
+
+[Element CLFE]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,lfe
+
.include analog-output.conf.common
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index 16dadc4..1b7482c 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -96,4 +96,10 @@ volume = merge
override-map.1 = lfe
override-map.2 = lfe,lfe
+[Element CLFE]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,lfe
+
.include analog-output.conf.common