mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

Do not reset user-enabled mute on EOF, but only on exit.

Browse Source 
Make behaviour more consistent with general volume control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24337 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-09-03 21:11:41 +00:00
parent a027248c5f
commit 527d293139
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mplayer.c
View File

@ -642,7 +642,7 @@ void uninit_player(unsigned int mask){
if(mask&INITED_AO){ if(mask&INITED_AO){
inited_flags&=~INITED_AO; inited_flags&=~INITED_AO;
current_module="uninit_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; mpctx->audio_out->uninit(mpctx->eof?0:1); mpctx->audio_out=NULL;
} }
@ -665,6 +665,7 @@ void uninit_player(unsigned int mask){
void exit_player_with_rc(const char* how, int rc){ 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); uninit_player(INITED_ALL);
#ifdef HAVE_X11 #ifdef HAVE_X11
#ifdef HAVE_NEW_GUI #ifdef HAVE_NEW_GUI