[MPlayer-cvslog] CVS: main/libvo vo_macosx.m, 1.33, 1.34 vo_quartz.c, 1.57, 1.58

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv1258/libvo

Modified Files:
	vo_macosx.m vo_quartz.c 
Log Message:
let osx sleep if video is paused

Index: vo_macosx.m
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_macosx.m,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vo_macosx.m	11 Jan 2006 02:45:17 -0000	1.33
+++ vo_macosx.m	7 Feb 2006 01:36:32 -0000	1.34
@@ -722,6 +722,21 @@
 			lastTime = curTime;
 		}
 	}
+	
+	//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;
+	}
 }
 
 /*
@@ -849,21 +864,6 @@
 {
 	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;
-	}
 }
 
 /*

Index: vo_quartz.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- vo_quartz.c	2 Nov 2005 21:50:55 -0000	1.57
+++ vo_quartz.c	7 Feb 2006 01:36:32 -0000	1.58
@@ -888,21 +888,6 @@
 		SendEventToEventTarget (theEvent, theTarget);
 		ReleaseEvent(theEvent);
 	}
-
-	//update activity every 30 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) >= 30) || (lastTime == 0))
-	{
-		UpdateSystemActivity(UsrActivity);
-		lastTime = curTime;
-	}
 }
 
 static void draw_osd(void)
@@ -996,6 +981,21 @@
 			lastTime = curTime;
 		}
 	}
+
+	//update activity every 30 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) >= 30) || (lastTime == 0))
+	{
+		UpdateSystemActivity(UsrActivity);
+		lastTime = curTime;
+	}
 }
 
 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)