Mercurial > mplayer.hg

changeset 21802:fa9422a466e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
restore volume if muted at exit
author ben
date Thu, 04 Jan 2007 16:30:06 +0000
parents f4c52a9738c1
children 3acc4b00bcc6
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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 )