Do not call resume on unpausing if we have already reached eof while

being paused (e.g. because of a "pausing_keep_force pt_step 1").


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29898 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-11-11 11:31:36 +00:00
parent 254b4855b1
commit 376aa9416f
1 changed files with 3 additions and 0 deletions

View File

@ -2443,6 +2443,9 @@ static void pause_loop(void)
} }
mpctx->osd_function=OSD_PLAY; mpctx->osd_function=OSD_PLAY;
if (mpctx->audio_out && mpctx->sh_audio) if (mpctx->audio_out && mpctx->sh_audio)
if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file
mpctx->audio_out->reset();
else
mpctx->audio_out->resume(); // resume audio mpctx->audio_out->resume(); // resume audio
if (mpctx->video_out && mpctx->sh_video && vo_config_count) if (mpctx->video_out && mpctx->sh_video && vo_config_count)
mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video