Mercurial > mplayer.hg

changeset 15612:06e30282b170

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved event update inside cocoa openglview class
author nplourde
date Thu, 02 Jun 2005 14:19:35 +0000
parents 2f77a2da1d82
children 5b57ccc4b640
files libvo/vo_macosx.m
diffstat 1 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_macosx.m	Thu Jun 02 14:10:52 2005 +0000
+++ b/libvo/vo_macosx.m	Thu Jun 02 14:19:35 2005 +0000
@@ -157,21 +157,6 @@
 static void check_events(void)
 {
 	[mpGLView check_events];
-	
-	//update activity every 60 seconds to prevent
-	//screensaver from starting up.
-	DateTimeRec d;
-	unsigned long curTime;
-	static unsigned long lastTime = 0;
-	
-	GetTime(&d);
-	DateToSeconds( &d, &curTime);
-	
-	if( ( (curTime - lastTime) >= 60) || (lastTime == 0))
-	{
-		UpdateSystemActivity(UsrActivity);
-		lastTime = curTime;
-	}
 }
 
 static void draw_osd(void)
@@ -758,6 +743,21 @@
 {
 	event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES];
 	[NSApp sendEvent:event];
+	
+	//update activity every 60 seconds to prevent
+	//screensaver from starting up.
+	DateTimeRec d;
+	unsigned long curTime;
+	static unsigned long lastTime = 0;
+	
+	GetTime(&d);
+	DateToSeconds( &d, &curTime);
+	
+	if( ( (curTime - lastTime) >= 60) || (lastTime == 0))
+	{
+		UpdateSystemActivity(UsrActivity);
+		lastTime = curTime;
+	}
 }
 
 /*