projects / platform / upstream / pulseaudio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf53143)
alsa-mixer: Add lineout to surround21 mappings
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>
Thu, 29 Jan 2015 11:53:08 +0000 (13:53 +0200)
committerDavid Henningsson <david.henningsson@canonical.com>
Thu, 29 Jan 2015 15:18:41 +0000 (10:18 -0500)
This makes the analog-surround-21 mapping consistent with other
surround mappings. I'm not sure if this makes any practical
difference, though.

src/modules/alsa/mixer/profile-sets/default.conf patch | blob | history
src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf patch | blob | history
src/modules/alsa/mixer/profile-sets/force-speaker.conf patch | blob | history

diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index bfb54c9e7ed23b8dbb3c1ad6611694c11fba4b5a..2d6720e7a6e4ce285fa758cb08ba656118ead510 100644 (file)
--- 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 9c57a200239126cd87961de9c0b9ab8b80013485..41924f47d626a11a11b39267070864560c5ec4ea 100644 (file)
--- 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 8e5d4298961c3f1256796ea529c815af91583877..dec57d5b56e94a5b66bf8963fa7a4720b9c0492d 100644 (file)
--- 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
 
Domain: Multimedia / Audio FW;