From 5a7c22a1ac4561aab90f316ee394aa269fb75408 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 7 Nov 2015 15:17:30 +0100 Subject: ao_alsa: remove the last bits of legacy channel map fallback Essentially we'd use something random, just because it's part of the srt of traditionally used ALSA channel mappings. But each driver can do its own things. This doesn't let me sleep at night, so remove it. --- audio/out/ao_alsa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'audio/out/ao_alsa.c') diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 6c34d6bcc1..4112ab3c83 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -691,9 +691,7 @@ static int init_device(struct ao *ao) if (num_channels != ao->channels.num) { int req = ao->channels.num; - mp_chmap_from_channels_alsa(&ao->channels, num_channels); - if (!mp_chmap_is_valid(&ao->channels)) - mp_chmap_from_channels(&ao->channels, 2); + mp_chmap_from_channels(&ao->channels, MPMIN(2, num_channels)); MP_ERR(ao, "Asked for %d channels, got %d - fallback to %s.\n", req, num_channels, mp_chmap_to_str(&ao->channels)); } -- cgit v1.2.3