Merge remote-tracking branch 'origin/master'

Conflicts:
	bstr.c
	bstr.h
	etc/input.conf
	input/input.c
	input/input.h
	libao2/ao_pulse.c
	libmpcodecs/vf_ass.c
	libmpcodecs/vf_vo.c
	libvo/gl_common.c
	libvo/x11_common.c
	mixer.c
	mixer.h
	mplayer.c

1 files changed, 3 insertions, 6 deletions

diff --git a/mixer.h b/mixer.h
index 6619783a58..d5af03bef2 100644
--- a/mixer.h
+++ b/mixer.h
@@ -24,17 +24,14 @@
 #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_s {
+typedef struct mixer {
     struct ao *ao;
     af_stream_t *afilter;
     int volstep;
     bool muted;
     bool mute_emulation;
+    bool softvol;
+    float softvol_max;
     float last_l, last_r;
     float restore_vol_l, restore_vol_r;
     bool restore_volume;