summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authornplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-02 14:19:35 +0000
committernplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-02 14:19:35 +0000
commitb39fbf374ddaba9959ec6a5ea7a9a16f495cb594 (patch)
treeb7c2b3cd19c9727d9f4e282f903ce4a3afc1a70b /libvo
parentc4d2a1e479e41d6929d914ca7723738d7362d997 (diff)
downloadmpv-b39fbf374ddaba9959ec6a5ea7a9a16f495cb594.tar.bz2
mpv-b39fbf374ddaba9959ec6a5ea7a9a16f495cb594.tar.xz
Moved event update inside cocoa openglview class
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15613 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_macosx.m30
1 files changed, 15 insertions, 15 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m
index 041ee0178d..e8b87c860f 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@@ -157,21 +157,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
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 @@ static uint32_t control(uint32_t request, void *data, ...)
{
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;
+ }
}
/*