From 2dc18a2f82ad2f2a7fa1d97978cab9fc58d7a450 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 7 Nov 2015 15:22:30 +0100
Subject: chmap: remove MPlayer layouts

Unused; last uses removed with the previous two commits.
---
 audio/chmap.c     | 26 --------------------------
 audio/chmap.h     |  1 -
 audio/chmap_sel.c | 11 -----------
 audio/chmap_sel.h |  1 -
 4 files changed, 39 deletions(-)

(limited to 'audio')

diff --git a/audio/chmap.c b/audio/chmap.c
index 8bd9b18d61..e0f485c4dc 100644
--- a/audio/chmap.c
+++ b/audio/chmap.c
@@ -112,19 +112,6 @@ static const struct mp_chmap default_layouts[] = {
     MP_CHMAP8(FL, FR, FC, LFE, BL, BR, SL, SR), // 7.1
 };
 
-// The channel order was lavc/waveex, but differs from lavc for 5, 6 and 8
-// channels. 3 and 7 channels were likely undefined (no ALSA support).
-// I'm not sure about the 4 channel case: ALSA uses "quad", while the ffmpeg
-// default layout is "4.0".
-static const char *const mplayer_layouts[MP_NUM_CHANNELS + 1] = {
-    [1] = "mono",
-    [2] = "stereo",
-    [4] = "quad",
-    [5] = "5.0(alsa)",
-    [6] = "5.1(alsa)",
-    [8] = "7.1(alsa)",
-};
-
 // Returns true if speakers are mapped uniquely, and there's at least 1 channel.
 bool mp_chmap_is_valid(const struct mp_chmap *src)
 {
@@ -227,19 +214,6 @@ void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels)
         mp_chmap_set_unknown(dst, num_channels);
 }
 
-// Try to do what mplayer/mplayer2/mpv did before channel layouts were
-// introduced, i.e. get the old default channel order.
-void mp_chmap_from_channels_alsa(struct mp_chmap *dst, int num_channels)
-{
-    if (num_channels < 0 || num_channels > MP_NUM_CHANNELS) {
-        *dst = (struct mp_chmap) {0};
-    } else {
-        mp_chmap_from_str(dst, bstr0(mplayer_layouts[num_channels]));
-        if (!dst->num)
-            mp_chmap_from_channels(dst, num_channels);
-    }
-}
-
 // Set *dst to an unknown layout for the given numbers of channels.
 // If the number of channels is invalid, an invalid map is set, and
 // mp_chmap_is_valid(dst) will return false.
diff --git a/audio/chmap.h b/audio/chmap.h
index 77769ec3ff..b32c63b6fc 100644
--- a/audio/chmap.h
+++ b/audio/chmap.h
@@ -108,7 +108,6 @@ void mp_chmap_fill_na(struct mp_chmap *map, int num);
 
 void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels);
 void mp_chmap_set_unknown(struct mp_chmap *dst, int num_channels);
-void mp_chmap_from_channels_alsa(struct mp_chmap *dst, int num_channels);
 
 void mp_chmap_remove_useless_channels(struct mp_chmap *map,
                                       const struct mp_chmap *requested);
diff --git a/audio/chmap_sel.c b/audio/chmap_sel.c
index 51a3eecf8b..8ddb7131e7 100644
--- a/audio/chmap_sel.c
+++ b/audio/chmap_sel.c
@@ -95,17 +95,6 @@ void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s)
     s->allow_waveext = true;
 }
 
-// Classic ALSA-based MPlayer layouts.
-void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s)
-{
-    for (int n = 1; n <= MP_NUM_CHANNELS; n++) {
-        struct mp_chmap t;
-        mp_chmap_from_channels_alsa(&t, n);
-        if (t.num)
-            mp_chmap_sel_add_map(s, &t);
-    }
-}
-
 // Add a channel map that should be allowed.
 void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map)
 {
diff --git a/audio/chmap_sel.h b/audio/chmap_sel.h
index 786f06f239..12ded3b466 100644
--- a/audio/chmap_sel.h
+++ b/audio/chmap_sel.h
@@ -37,7 +37,6 @@ struct mp_chmap_sel {
 void mp_chmap_sel_add_any(struct mp_chmap_sel *s);
 void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s);
 void mp_chmap_sel_add_waveext_def(struct mp_chmap_sel *s);
-void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s);
 void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map);
 void mp_chmap_sel_add_speaker(struct mp_chmap_sel *s, int id);
 bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map);
-- 
cgit v1.2.3