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>

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 ba4cd5c90d39a66acf57164dcbf6a9a44a726699..14d67b0095d44d2b1b3b10ce6b529cfe5b324e79 100644 (file)
--- 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 7540315e6f8d285dc82d2f8fe5595df54c70b32b..a7e3c4c85fb3f33a4bd040c661f46418a6da9c4e 100644 (file)
--- 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 16dadc44868a909f467f7b29d2ea3675e994dc91..1b7482c9db6b46956c4fe37125b7dda20964b63b 100644 (file)
--- 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