diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2012-05-01 20:09:12 +0300 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-05-11 16:55:29 +0530 |
| commit | 7bb8442c111d5e1fba20eb101eb854edd5392627 (patch) | |
| tree | f080df81b2cd5d727092f2455d7acc4441fecde1 | |
| parent | 1eb7c4a465e804c3fe6e7d34e771d6d870268473 (diff) | |
alsa: Add support for sound cards with 4-channel input.
Changes in v2:
- Call the mapping a generic 4-channel input mapping
instead of a 4-channel mic array mapping. The mapping
will be used also by sound cards that have two stereo
input jacks, so in those cases talking about mic arrays
is wrong.
- Added a comment about using the "hw" device name.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=45813
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 1 | ||||
| -rw-r--r-- | src/modules/alsa/mixer/profile-sets/default.conf | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index abb12ee0..8b54f751 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -3888,6 +3888,7 @@ static int mapping_verify(pa_alsa_mapping *m, const pa_channel_map *bonus) { { "analog-surround-61", N_("Analog Surround 6.1") }, { "analog-surround-70", N_("Analog Surround 7.0") }, { "analog-surround-71", N_("Analog Surround 7.1") }, + { "analog-4-channel-input", N_("Analog 4-channel Input") }, { "iec958-stereo", N_("Digital Stereo (IEC958)") }, { "iec958-passthrough", N_("Digital Passthrough (IEC958)") }, { "iec958-ac3-surround-40", N_("Digital Surround 4.0 (IEC958/AC3)") }, diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index 5ac322b8..28c8650d 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -148,6 +148,15 @@ paths-output = analog-output 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 +# device name standardized in alsa. +device-strings = hw:%f +channel-map = aux0,aux1,aux2,aux3 +priority = 1 +direction = input + [Mapping iec958-stereo] device-strings = iec958:%f channel-map = left,right |