From ec58e5a3848f82681839eaa15d2c6912d92e74ed Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Sat, 21 Jan 2012 09:28:07 +0200
Subject: options: move mixer.h options to struct

---
 libao2/audio_out.h          | 1 +
 libao2/audio_out_internal.h | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'libao2')

diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index e96e123700..cbd913656b 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -80,6 +80,7 @@ struct ao {
     bool untimed;
     const struct ao_driver *driver;
     void *priv;
+    struct MPOpts *opts;
 };
 
 extern char *ao_subdevice;
diff --git a/libao2/audio_out_internal.h b/libao2/audio_out_internal.h
index 67bcfa953d..215428fb0e 100644
--- a/libao2/audio_out_internal.h
+++ b/libao2/audio_out_internal.h
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_AUDIO_OUT_INTERNAL_H
 #define MPLAYER_AUDIO_OUT_INTERNAL_H
 
+#include "options.h"
+
 // prototypes:
 //static ao_info_t info;
 static int control(int cmd, void *arg);
@@ -33,6 +35,8 @@ static void audio_resume(void);
 
 extern struct ao *global_ao;
 #define ao_data (*global_ao)
+#define mixer_channel (global_ao->opts->mixer_channel)
+#define mixer_device (global_ao->opts->mixer_device)
 
 #define LIBAO_EXTERN(x) const struct ao_driver audio_out_##x = { \
     .info = &info,                                               \
-- 
cgit v1.2.3