summaryrefslogtreecommitdiff
path: root/src/modules/alsa/mixer/profile-sets/default.conf
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2018-06-01 11:24:01 +0300
committerArun Raghavan <arun@arunraghavan.net>2018-06-21 06:30:25 +0530
commit3455d62e4906174e83bf0ea9af8b584808d3e779 (patch)
tree21012a49276ff2c54c2718309cebfe7f37d77c1b /src/modules/alsa/mixer/profile-sets/default.conf
parent5c2d28f6dff160c51fd6627323377795bbcd35b2 (diff)
alsa-mixer: make the mono mapping a fallback only
If a sound card doesn't have the "front" device defined for it, we have to use the "hw" device for stereo. Not so long ago, the analog-stereo mapping had "hw:%f" in its device-strings and everything worked great, except that it caused trouble with the Intel HDMI LPE driver that uses the first "hw" device for HDMI, and we were incorrectly detecting it as an analog device. That problem was fixed in commit ea3ebd09, which removed "hw:%f" from analog-stereo and added a new stereo fallback mapping for "hw". Now the problem is that if a sound card doesn't have the "front" device defined for it, and it supports both mono and stereo, only the mono mapping is used, because the stereo mapping is only a fallback. This patch makes the mono mapping a fallback too, so the mono mapping is used only if there's absolutely nothing else that works. This can cause trouble at least in theory. Maybe someone actually wants to use mono output on a card that supports both mono and stereo. But that seems quite unlikely.
Diffstat (limited to 'src/modules/alsa/mixer/profile-sets/default.conf')
-rw-r--r--src/modules/alsa/mixer/profile-sets/default.conf18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index f5093830..34c51bc5 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -101,13 +101,6 @@
[General]
auto-profiles = yes
-[Mapping analog-mono]
-device-strings = hw:%f
-channel-map = mono
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
-paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
-priority = 7
-
[Mapping analog-stereo]
device-strings = front:%f
channel-map = left,right
@@ -115,7 +108,7 @@ paths-output = analog-output analog-output-lineout analog-output-speaker analog-
paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
priority = 15
-# If everything else fails, try to use hw:0 as a stereo device.
+# If everything else fails, try to use hw:0 as a stereo device...
[Mapping stereo-fallback]
device-strings = hw:%f
fallback = yes
@@ -124,6 +117,15 @@ paths-output = analog-output analog-output-lineout analog-output-speaker analog-
paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
priority = 1
+# ...and if even that fails, try to use hw:0 as a mono device.
+[Mapping mono-fallback]
+device-strings = hw:%f
+fallback = yes
+channel-map = mono
+paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
+priority = 1
+
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe