From 01622717257673d424debfa762536f998d97a4dd Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 19 Sep 2013 14:33:26 +0200
Subject: mixer: make struct opaque

Also remove stray include statements from ao_alsa and ao_oss.
---
 mpvcore/mplayer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mpvcore/mplayer.c')

diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c
index 00229364e6..dc4322d4e3 100644
--- a/mpvcore/mplayer.c
+++ b/mpvcore/mplayer.c
@@ -449,7 +449,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask)
 
     if (mask & INITIALIZED_ACODEC) {
         mpctx->initialized_flags &= ~INITIALIZED_ACODEC;
-        mixer_uninit_audio(&mpctx->mixer);
+        mixer_uninit_audio(mpctx->mixer);
         if (mpctx->sh_audio)
             uninit_audio(mpctx->sh_audio);
         cleanup_demux_stream(mpctx, STREAM_AUDIO);
@@ -1608,7 +1608,7 @@ static int recreate_audio_filters(struct MPContext *mpctx)
         return -1;
     }
 
-    mixer_reinit_audio(&mpctx->mixer, mpctx->ao, mpctx->sh_audio->afilter);
+    mixer_reinit_audio(mpctx->mixer, mpctx->ao, mpctx->sh_audio->afilter);
 
     return 0;
 }
@@ -4826,7 +4826,7 @@ static int mpv_main(int argc, char *argv[])
     init_libav();
     GetCpuCaps(&gCpuCaps);
     screenshot_init(mpctx);
-    mixer_init(&mpctx->mixer, opts);
+    mpctx->mixer = mixer_init(mpctx, opts);
 
     // Preparse the command line
     m_config_preparse_command_line(mpctx->mconfig, argc, argv);
-- 
cgit v1.2.3