summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2012-09-12 16:03:59 +0300
committerWim Taymans <wtaymans@redhat.com>2014-06-05 12:11:47 +0200
commitca1c9ca790cadd7fe6a23150d84d2160b1972c87 (patch)
treea7c43a0d1475e6c5c021cbbbac31bac2ce401cb2
parent5d298f156e440ef748b65cc3b1edf2aac006de97 (diff)
alsa-mixer: Don't use the mono path in the analog-stereo mapping.
As far as I can see, having a mono path in a stereo mapping doesn't make any sense. It also causes breakage: if the Master Mono mixer element has two volume channels, the analog-output path gets removed due to being a subset of analog-output-mono, and that in turn causes the Master element getting muted. Users generally don't like that. BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=54673
-rw-r--r--src/modules/alsa/mixer/profile-sets/default.conf2
-rw-r--r--src/modules/alsa/mixer/profile-sets/extra-hdmi.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index c805d3679..359953513 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -108,7 +108,7 @@ priority = 1
[Mapping analog-stereo]
device-strings = front:%f hw:%f
channel-map = left,right
-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
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 = 10
diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
index aaf4d91e8..098de0368 100644
--- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
+++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
@@ -34,7 +34,7 @@ priority = 1
[Mapping analog-stereo]
device-strings = front:%f hw:%f
channel-map = left,right
-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
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 = 10