Mercurial > mplayer.hg

changeset 20900:b0f2e9a16bb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move xscreensaver_heartbeat call next to vo check_events
author uau
date Tue, 14 Nov 2006 09:52:49 +0000
parents c00d8c1aa0ab
children b875b84a511e
files mplayer.c
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue Nov 14 09:29:03 2006 +0000
+++ b/mplayer.c	Tue Nov 14 09:52:49 2006 +0000
@@ -4423,6 +4423,13 @@
     current_module="vo_check_events";
     if (vo_config_count) video_out->check_events();
 
+#ifdef HAVE_X11
+    if (stop_xscreensaver) {
+	current_module = "stop_xscreensaver";
+	xscreensaver_heartbeat();
+    }
+#endif
+
     frame_time_remaining = sleep_until_update(&time_frame, &aq_sleep_time);
 
 //====================== FLIP PAGE (VIDEO BLT): =========================
@@ -5421,14 +5428,6 @@
   }
 #endif
 
-#ifdef HAVE_X11
-if (stop_xscreensaver && sh_video) {
-  current_module="stop_xscreensaver";
-  xscreensaver_heartbeat();
-  current_module=NULL;
-}
-#endif
-  
   // DVD sub:
 if(vo_config_count && vo_spudec) {
   unsigned char* packet=NULL;