[MPlayer-cvslog] r21820 - trunk/mplayer.c

[ben]

Author: ben
Date: Thu Jan  4 17:30:06 2007
New Revision: 21820

Modified:
   trunk/mplayer.c

Log:
restore volume if muted at exit

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Thu Jan  4 17:30:06 2007
@@ -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 )