From aea2328906fc754c0d0cdea57c60d71522ae99a5 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Apr 2013 23:06:22 +0200
Subject: audio/out: switch to channel map

This actually breaks audio for 5/6/8 channels. There's no reordering
done yet. The actual reordering will be done inside of af_lavrresample
and has to be made part of the format negotiation.
---
 audio/out/ao.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'audio/out/ao.h')

diff --git a/audio/out/ao.h b/audio/out/ao.h
index e57fff7a95..465bcf6197 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -23,6 +23,7 @@
 
 #include "core/bstr.h"
 #include "core/mp_common.h"
+#include "audio/chmap.h"
 
 enum aocontrol {
     // _VOLUME commands take struct ao_control_vol pointer for input/output.
@@ -55,7 +56,7 @@ typedef struct ao_info {
 /* interface towards mplayer and */
 typedef struct ao_old_functions {
     int (*control)(int cmd, void *arg);
-    int (*init)(int rate, int channels, int format, int flags);
+    int (*init)(int rate, const struct mp_chmap *channels, int format, int flags);
     void (*uninit)(int immed);
     void (*reset)(void);
     int (*get_space)(void);
@@ -86,7 +87,7 @@ struct ao_driver {
 /* global data used by mplayer and plugins */
 struct ao {
     int samplerate;
-    int channels;
+    struct mp_chmap channels;
     int format;
     int bps; // bytes per second
     int outburst;
-- 
cgit v1.2.3