mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: Add support for sound cards with 4-channel input.

Browse source 
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
This commit is contained in:
Tanu Kaskinen 2012-05-01 20:09:12 +03:00 • committed by Arun Raghavan
parent 1eb7c4a465
commit 7bb8442c11
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/alsa/alsa-mixer.c
View file

@ -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)") },

9
src/modules/alsa/mixer/profile-sets/default.conf
View file

@ -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