From 0830e0545327f92aa4dce35235e0732d3693fc33 Mon Sep 17 00:00:00 2001 From: uau Date: Tue, 14 Nov 2006 09:52:49 +0000 Subject: Move xscreensaver_heartbeat call next to vo check_events git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20916 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index b49cb76f0f..249791bef7 100644 --- a/mplayer.c +++ b/mplayer.c @@ -4423,6 +4423,13 @@ if(!sh_video) { 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 @@ if ((user_muted | edl_muted) != mixer.muted) mixer_mute(&mixer); } #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; -- cgit v1.2.3