CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv11184/libvo Modified Files: vo_macosx.m Log Message: Moved event update inside cocoa openglview class Index: vo_macosx.m =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_macosx.m,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vo_macosx.m 2 Jun 2005 14:10:52 -0000 1.11 +++ vo_macosx.m 2 Jun 2005 14:19:35 -0000 1.12 @@ -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; + } } /*