diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-01 14:58:11 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-01 14:58:11 +0000 |
| commit | 3aa3fbbf6c4a9f5a049814b83ec8daebd0a89eb7 (patch) | |
| tree | b140cac42bda43fe8ec5db63aa3a4bb56756e382 /libvo | |
| parent | 1fe014dfd779293c7f008a3bee699001164f991c (diff) | |
| download | mpv-3aa3fbbf6c4a9f5a049814b83ec8daebd0a89eb7.tar.bz2 mpv-3aa3fbbf6c4a9f5a049814b83ec8daebd0a89eb7.tar.xz | |
Fix declarations vs statements warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21411 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_macosx.m | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 49c2097b2a..ad60ff459b 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -413,7 +413,7 @@ static int control(uint32_t request, void *data, ...) */ - (void)initMenu { - NSMenu *menu; + NSMenu *menu, *aspectMenu; NSMenuItem *menuItem; [NSApp setMainMenu:[[NSMenu alloc] init]]; @@ -430,7 +430,6 @@ static int control(uint32_t request, void *data, ...) kFullScreenCmd = menuItem; menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem]; - NSMenu *aspectMenu; aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; if(vo_keepaspect) [menuItem setState:NSOnState]; @@ -666,6 +665,9 @@ static int control(uint32_t request, void *data, ...) */ - (void) render { + int curTime; + static int lastTime; + glClear(GL_COLOR_BUFFER_BIT); glEnable(CVOpenGLTextureGetTarget(texture)); @@ -721,8 +723,8 @@ static int control(uint32_t request, void *data, ...) //update activity every 30 seconds to prevent //screensaver from starting up. - int curTime = TickCount()/60; - static int lastTime = 0; + curTime = TickCount()/60; + lastTime = 0; if( ((curTime - lastTime) >= 30) || (lastTime == 0) ) { |