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

---
 mixer.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'mixer.h')

diff --git a/mixer.h b/mixer.h
index d7a88f74df..eaf81c1ba1 100644
--- a/mixer.h
+++ b/mixer.h
@@ -19,18 +19,17 @@
 #ifndef MPLAYER_MIXER_H
 #define MPLAYER_MIXER_H
 
+#include <stdbool.h>
+
 #include "libaf/af.h"
 #include "libao2/audio_out.h"
 
-extern char * mixer_device;
-extern char * mixer_channel;
-extern int soft_vol;
-extern float soft_vol_max;
-
 typedef struct mixer {
     struct ao *ao;
     af_stream_t *afilter;
     int volstep;
+    bool softvol;
+    float softvol_max;
     int muted;
     float last_l, last_r;
 } mixer_t;
-- 
cgit v1.2.3