Mercurial > mplayer.hg

changeset 21395:dd05dd9e3e7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix declarations vs statements warning.
author diego
date Fri, 01 Dec 2006 14:58:11 +0000
parents 3fbaca74f486
children 856d660a1ebd
files libvo/vo_macosx.m
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_macosx.m	Fri Dec 01 13:17:07 2006 +0000
+++ b/libvo/vo_macosx.m	Fri Dec 01 14:58:11 2006 +0000
@@ -413,7 +413,7 @@
 */
 - (void)initMenu
 {
-	NSMenu *menu;
+	NSMenu *menu, *aspectMenu;
 	NSMenuItem *menuItem;
 	
 	[NSApp setMainMenu:[[NSMenu alloc] init]];
@@ -430,7 +430,6 @@
 	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 @@
 */ 
 - (void) render
 {
+	int curTime;
+	static int lastTime;
+
 	glClear(GL_COLOR_BUFFER_BIT);	
 	
 	glEnable(CVOpenGLTextureGetTarget(texture));
@@ -721,8 +723,8 @@
 	
 	//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) )
 	{