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

alsa: Remove four channel input profile

Browse source 
With the new multichannel profile, we can remove this one and
handle the four channel input as a generic multichannel fallback.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2014-08-01 18:09:42 +02:00
parent 3a04554f9e
commit 2575b102b9
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3871,7 +3871,6 @@ 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

@ -159,15 +159,6 @@ paths-output = analog-output analog-output-lineout analog-output-speaker analog-
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 = 2
direction = input
[Mapping iec958-stereo]
device-strings = iec958:%f
channel-map = left,right