mirror of
https://github.com/mpv-player/mpv
synced 2025-01-23 16:13:39 +00:00
Do not reset user-enabled mute on EOF, but only on exit.
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:
parent
a027248c5f
commit
527d293139
@ -642,7 +642,7 @@ void uninit_player(unsigned int mask){
|
||||
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 uninit_player(unsigned int mask){
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user