[MPlayer-cvslog] r29898 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Wed Nov 11 12:31:36 2009
New Revision: 29898

Log:
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").

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Nov 11 12:22:12 2009	(r29897)
+++ trunk/mplayer.c	Wed Nov 11 12:31:36 2009	(r29898)
@@ -2443,6 +2443,9 @@ static void pause_loop(void)
     }
     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