[vlc-commits] Mono: fix channel order

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Dec  4 16:15:34 2011 +0100| [a99a0610843c1fc337b88fb761958a223241d44f] | committer: Jean-Baptiste Kempf

Mono: fix channel order
(cherry picked from commit 303de67a0d1eb0d98145d8b0d3ff55a7f44aef59)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=a99a0610843c1fc337b88fb761958a223241d44f
---

 modules/audio_filter/channel_mixer/mono.c |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 109c239..e776cae 100644
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -89,15 +89,21 @@ struct filter_sys_t
 #define MONO_CHANNEL_LONGTEXT N_("This option silences all other channels " \
     "except the selected channel.")
 
-static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5 };
+static const int pi_pos_values[] = { 0, 1, 4, 5, 7, 8, 2, 3, 6 };
 static const char *const ppsz_pos_descriptions[] =
-{ N_("Left"), N_("Right"), N_("Left rear"), N_("Right rear"), N_("Center"),
-  N_("Left front") };
+{ N_("Left"), N_("Right"),
+  N_("Rear left"), N_("Rear right"),
+  N_("Center"), N_("Low-frequency effects"),
+  N_("Side left"), N_("Side right"), N_("Rear center") };
 
-/* our internal channel order (WG-4 order) */
-static const uint32_t pi_channels_out[] =
-{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
-  AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
+/* our internal channel order (WG-4 order)
+static const uint32_t pi_vlc_chan_order_wg4[] =
+{
+    AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
+    AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
+    AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
+    AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0
+}; */
 
 #define MONO_CFG "sout-mono-"
 /*****************************************************************************