Mercurial > mplayer.hg

changeset 29856:3a6ae46759de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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").
author reimar
date Wed, 11 Nov 2009 11:31:36 +0000
parents 5e279f7d7e5d
children d2853289006d
files mplayer.c
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Wed Nov 11 11:22:12 2009 +0000
+++ b/mplayer.c	Wed Nov 11 11:31:36 2009 +0000
@@ -2443,6 +2443,9 @@
     }
     mpctx->osd_function=OSD_PLAY;
     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
     if (mpctx->video_out && mpctx->sh_video && vo_config_count)
         mpctx->video_out->control(VOCTRL_RESUME, NULL);	// resume video