RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 20:32:13 +00:00
Code Issues Releases Wiki Activity

Fix declarations vs statements warning.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21411 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-12-01 14:58:11 +00:00
parent 1fe014dfd7
commit 3aa3fbbf6c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libvo/vo_macosx.m
View File

@ -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) )
{