Mercurial > mplayer.hg

changeset 24317:d6d9d3388a21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not reset user-enabled mute on EOF, but only on exit. Make behaviour more consistent with general volume control.
author reimar
date Mon, 03 Sep 2007 21:11:41 +0000
parents 31dbcf68a706
children e6e8bf060dae
files mplayer.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Mon Sep 03 14:21:53 2007 +0000
+++ b/mplayer.c	Mon Sep 03 21:11:41 2007 +0000
@@ -642,7 +642,7 @@
   if(mask&INITED_AO){
     inited_flags&=~INITED_AO;
     current_module="uninit_ao";
-    if (mpctx->user_muted | mpctx->edl_muted) mixer_mute(&mpctx->mixer); 
+    if (mpctx->edl_muted) mixer_mute(&mpctx->mixer); 
     mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL;
   }
 
@@ -665,6 +665,7 @@
 
 void exit_player_with_rc(const char* how, int rc){
 
+  if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer); 
   uninit_player(INITED_ALL);
 #ifdef HAVE_X11
 #ifdef HAVE_NEW_GUI