# HG changeset patch # User ben # Date 1167928206 0 # Node ID fa9422a466e55fc12d6bca38fdd547627406d17a # Parent f4c52a9738c14e14ad3d71a30296d3013276e43b restore volume if muted at exit diff -r f4c52a9738c1 -r fa9422a466e5 mplayer.c --- a/mplayer.c Thu Jan 04 16:10:40 2007 +0000 +++ b/mplayer.c Thu Jan 04 16:30:06 2007 +0000 @@ -593,6 +593,11 @@ return meta; } +#include "mixer.h" +mixer_t mixer; +/// step size of mixer changes +int volstep = 3; + static void uninit_player(unsigned int mask){ mask=inited_flags&mask; @@ -669,6 +674,7 @@ if(mask&INITED_AO){ inited_flags&=~INITED_AO; current_module="uninit_ao"; + if (user_muted | edl_muted) mixer_mute(&mixer); audio_out->uninit(eof?0:1); audio_out=NULL; } @@ -815,11 +821,6 @@ extern void mp_input_register_options(m_config_t* cfg); -#include "mixer.h" -mixer_t mixer; -/// step size of mixer changes -int volstep = 3; - #include "cfg-mplayer.h" static void parse_cfgfiles( m_config_t* conf )