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

[ib]

Author: ib
Date: Thu Aug  1 19:12:26 2013
New Revision: 36383

Log:
Place GUI_HANDLE_EVENTS calls after GUI_REDRAW calls.

The redraw will generate events, which should be handled afterwards
(if already in the event queue).

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Thu Aug  1 19:10:10 2013	(r36382)
+++ trunk/mplayer.c	Thu Aug  1 19:12:26 2013	(r36383)
@@ -2564,8 +2564,8 @@ static void pause_loop(void)
             mpctx->video_out->check_events();
 #ifdef CONFIG_GUI
         if (use_gui) {
-            gui(GUI_HANDLE_EVENTS, 0);
             gui(GUI_REDRAW, 0);
+            gui(GUI_HANDLE_EVENTS, 0);
             if (guiInfo.Playing != GUI_PAUSE || (rel_seek_secs || abs_seek_pos))
                 break;
         }
@@ -3095,8 +3095,8 @@ play_next_file:
         while (guiInfo.Playing != GUI_PLAY) {
             mp_cmd_t *cmd;
             usec_sleep(20000);
-            gui(GUI_HANDLE_EVENTS, 0);
             gui(GUI_REDRAW, 0);
+            gui(GUI_HANDLE_EVENTS, 0);
             if ((cmd = mp_input_get_cmd(0, 0, 0)) != NULL) {
                 if (cmd->id == MP_CMD_GUI)
                     gui(GUI_RUN_MESSAGE, cmd->args[0].v.s);
@@ -3996,7 +3996,6 @@ goto_enable_cache:
 
 #ifdef CONFIG_GUI
             if (use_gui) {
-                gui(GUI_HANDLE_EVENTS, 0);
                 if (mpctx->demuxer->file_format == DEMUXER_TYPE_AVI && mpctx->sh_video && mpctx->sh_video->video.dwLength > 2) {
                     // get pos from frame number / total frames
                     guiInfo.Position = (float)mpctx->d_video->pack_no * 100.0f / mpctx->sh_video->video.dwLength;
@@ -4010,6 +4009,7 @@ goto_enable_cache:
                 guiInfo.RunningTime = demuxer_get_time_length(mpctx->demuxer);
                 gui(GUI_SET_MIXER, 0);
                 gui(GUI_REDRAW, 0);
+                gui(GUI_HANDLE_EVENTS, 0);
                 if (guiInfo.Playing == GUI_STOP)
                     break;                  // STOP
                 if (guiInfo.Playing == GUI_PAUSE)