Mercurial > mplayer.hg

changeset 28010:0a0f63090e60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
factorize mouse hiding and screensaver disabling code Based on the patch posted in thread: from Gregor Riepl %onitake A gmail P com% date: Wed, Oct 29, 2008 at 7:26 PM subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz
author gpoirier
date Thu, 27 Nov 2008 11:34:26 +0000
parents 1653ae9be02f
children 7f7ffa0eb45a
files libvo/vo_macosx.h libvo/vo_macosx.m
diffstat 2 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_macosx.h	Wed Nov 26 18:49:16 2008 +0000
+++ b/libvo/vo_macosx.h	Thu Nov 27 11:34:26 2008 +0000
@@ -56,6 +56,10 @@
 	NSMenuItem *kAspectFullCmd;
 	NSMenuItem *kAspectWideCmd;
 	NSMenuItem *kPanScanCmd;
+	
+	//timestamps for disabling screensaver and mouse hiding
+	int lastMouseHide;
+	int lastScreensaverUpdate;
 }
 
 - (BOOL) acceptsFirstResponder;
--- a/libvo/vo_macosx.m	Wed Nov 26 18:49:16 2008 +0000
+++ b/libvo/vo_macosx.m	Thu Nov 27 11:34:26 2008 +0000
@@ -759,28 +759,25 @@
 	
 	glFlush();
 	
+	curTime  = TickCount()/60;
+
 	//auto hide mouse cursor (and future on-screen control?)
 	if(isFullscreen && !mouseHide && !isRootwin)
 	{
-		int curTime = TickCount()/60;
-		static int lastTime = 0;
-		
-		if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
+		if( ((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0) )
 		{
 			CGDisplayHideCursor(kCGDirectMainDisplay);
-			mouseHide = YES;
-			lastTime = curTime;
+			mouseHide = TRUE;
+			lastMouseHide = curTime;
 		}
 	}
 	
 	//update activity every 30 seconds to prevent
 	//screensaver from starting up.
-	curTime  = TickCount()/60;
-		
-	if( ((curTime - lastTime) >= 30) || (lastTime == 0) )
+	if( ((curTime - lastScreensaverUpdate) >= 30) || (lastScreensaverUpdate == 0) )
 	{
 		UpdateSystemActivity(UsrActivity);
-		lastTime = curTime;
+		lastScreensaverUpdate = curTime;
 	}
 }