# HG changeset patch # User nplourde # Date 1117721975 0 # Node ID 06e30282b17092d0833a38dfa1dfd9d5eba79206 # Parent 2f77a2da1d8217dac6f55d166a4196ffdca7f2d3 Moved event update inside cocoa openglview class diff -r 2f77a2da1d82 -r 06e30282b170 libvo/vo_macosx.m --- 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; + } } /*