summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2015-01-29 13:53:08 +0200
committerDavid Henningsson <david.henningsson@canonical.com>2015-01-29 10:18:41 -0500
commitf75335f25c49b2d2ff26181902c4f6f90ae7cab6 (patch)
tree5634725e111216361580dc2a54a2680eaf130d01
parentbf53143387d097bafa66a1c14ddcf6e35483f195 (diff)
alsa-mixer: Add lineout to surround21 mappings
This makes the analog-surround-21 mapping consistent with other surround mappings. I'm not sure if this makes any practical difference, though.
-rw-r--r--src/modules/alsa/mixer/profile-sets/default.conf2
-rw-r--r--src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf2
-rw-r--r--src/modules/alsa/mixer/profile-sets/force-speaker.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index bfb54c9e7..2d6720e7a 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -118,7 +118,7 @@ priority = 10
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-speaker
+paths-output = analog-output analog-output-lineout analog-output-speaker
priority = 8
direction = output
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
index 9c57a2002..41924f47d 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf
@@ -37,7 +37,7 @@ priority = 10
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-speaker-always
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
priority = 8
direction = output
diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
index 8e5d42989..dec57d5b5 100644
--- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf
+++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf
@@ -36,7 +36,7 @@ priority = 10
[Mapping analog-surround-21]
device-strings = surround21:%f
channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-speaker-always
+paths-output = analog-output analog-output-lineout analog-output-speaker-always
priority = 8
direction = output