diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2013-06-04 15:41:57 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-06-10 17:03:02 +0300 |
| commit | ecf3ab2b5788c85c237eeb6429bd1d525b9ac0cc (patch) | |
| tree | 275b8ee00e0f456ee8442c5529acf42048bec00f /src/modules/alsa/mixer/profile-sets | |
| parent | 22aac4e9fdb3786178f7815a0cb2150f588b1582 (diff) | |
alsa-mixer: Add "Line Out" path
If there is a "Line Out" jack present, then add this path. The fallback
analog-output will be a subset of this path and removed.
I only use the "Line Out Jack" or "Line Out Front Jack" for actual jack
detection - without anything connected to the front jack, it makes little
sense to enable the port.
(Another option could perhaps be to use different paths for stereo line out
and surround line outs, but that could be a possible future improvement.)
Diffstat (limited to 'src/modules/alsa/mixer/profile-sets')
4 files changed, 28 insertions, 28 deletions
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index 359953513..932624582 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -98,56 +98,56 @@ [General] auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -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-lineout analog-output-speaker analog-output-desktop-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-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 +paths-output = analog-output analog-output-lineout 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 [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-71] device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-4-channel-input] # Alsa doesn't currently provide any better device name than "hw" for 4-channel # input. If this causes trouble at some point, then we will need to get a new diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf index 098de0368..96652f8c0 100644 --- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf +++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf @@ -24,56 +24,56 @@ [General] auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -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-lineout analog-output-speaker analog-output-desktop-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-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 +paths-output = analog-output analog-output-lineout 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 [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-71] device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping iec958-stereo] device-strings = iec958:%f channel-map = left,right 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 2095cf93d..66b18b390 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 @@ -21,56 +21,56 @@ [General] auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-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-always 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 priority = 1 [Mapping analog-stereo] device-strings = front:%f hw:%f channel-map = left,right -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-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-always 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 priority = 10 [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-71] device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-4-channel-input] # Alsa doesn't currently provide any better device name than "hw" for 4-channel # input. If this causes trouble at some point, then we will need to get a new diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf index f03ada64d..7c5c1b842 100644 --- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf +++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf @@ -20,56 +20,56 @@ [General] auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-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 priority = 1 [Mapping analog-stereo] device-strings = front:%f hw:%f channel-map = left,right -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-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 priority = 10 [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-71] device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-4-channel-input] # Alsa doesn't currently provide any better device name than "hw" for 4-channel # input. If this causes trouble at some point, then we will need to get a new |