summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2020-09-03 14:28:29 +0300
committerArun Raghavan <arun@arunraghavan.net>2020-11-23 21:44:00 +0000
commita28f2e7293a055588f7bba568b5049ff91b3aad0 (patch)
treef255fbb86d0277de63b4c3cd842e037d9620a572
parentd5d08035913be89ad0dec99b4759ab9377bc1eea (diff)
alsa-mixer: Add support for the Center/LFE element
We already supported the CLFE element, which should be semantically equivalent, so I just copied all the CLFE element definitions. The Center/LFE element is seen on Creative X-Fi with 20K1 chipset cards. Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/978
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-headphones.conf4
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-lineout.conf6
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker-always.conf6
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker.conf6
-rw-r--r--src/modules/alsa/mixer/paths/analog-output.conf6
5 files changed, 28 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index d4ad7777d..14fb81481 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -160,4 +160,8 @@ volume = off
switch = off
volume = off
+[Element Speaker Center/LFE]
+switch = off
+volume = off
+
.include analog-output.conf.common
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index 9a6af3ad8..61df49965 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -181,6 +181,12 @@ volume = merge
override-map.1 = all-center
override-map.2 = all-center,lfe
+[Element Center/LFE]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,lfe
+
[Element Bass Speaker]
switch = off
volume = off
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 71f356dce..bf781c671 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -174,4 +174,10 @@ volume = merge
override-map.1 = all-center
override-map.2 = all-center,lfe
+[Element Center/LFE]
+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 27a3983d5..1610b9a05 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -220,6 +220,12 @@ volume = merge
override-map.1 = all-center
override-map.2 = all-center,lfe
+[Element Center/LFE]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,lfe
+
[Element Speaker CLFE]
switch = mute
volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index e6ba98358..0f6b5f5a0 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -79,4 +79,10 @@ volume = merge
override-map.1 = all-center
override-map.2 = all-center,lfe
+[Element Center/LFE]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,lfe
+
.include analog-output.conf.common