diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-25 11:14:07 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:45 +0200 |
| commit | 5f5a12a939ef1ce1d75cf72f167cb0baa9d310c2 (patch) | |
| tree | 4fa88d5e344ece344b011a45c7ccfe100f6528ca /libvo/vo_corevideo.m | |
| parent | 2fa911a6f5ab4d41ae5abdd1b86c12d3b1e64003 (diff) | |
| download | mpv-5f5a12a939ef1ce1d75cf72f167cb0baa9d310c2.tar.bz2 mpv-5f5a12a939ef1ce1d75cf72f167cb0baa9d310c2.tar.xz | |
vo_corevideo.m: remote useless parentheses and casts
Remove useless ().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31802 b3059339-0415-0410-9bf9-f77b7e298cf2
Remove yet more useless ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31803 b3059339-0415-0410-9bf9-f77b7e298cf2
Remove pointless casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31804 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_corevideo.m')
| -rw-r--r-- | libvo/vo_corevideo.m | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index 141cecda9a..14d664cdd3 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -417,10 +417,10 @@ static int control(uint32_t request, void *data) case VOCTRL_DRAW_IMAGE: return draw_image(data); case VOCTRL_PAUSE: return int_pause = 1; case VOCTRL_RESUME: return int_pause = 0; - case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); - case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; - case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE; - case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE; + case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t*)data); + case VOCTRL_ONTOP: vo_ontop = !vo_ontop; if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; + case VOCTRL_ROOTWIN: vo_rootwin = !vo_rootwin; [mpGLView rootwin]; return VO_TRUE; + case VOCTRL_FULLSCREEN: vo_fs = !vo_fs; if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE; case VOCTRL_GET_PANSCAN: return VO_TRUE; case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE; case VOCTRL_UPDATE_SCREENINFO: update_screen_info(); return VO_TRUE; @@ -554,7 +554,7 @@ static int control(uint32_t request, void *data) kDoubleScreenCmd = menuItem; menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; kFullScreenCmd = menuItem; - menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem]; + menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem]; aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; @@ -563,7 +563,7 @@ static int control(uint32_t request, void *data) menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; if(vo_panscan) [menuItem setState:NSOnState]; kPanScanCmd = menuItem; - menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; + menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; kAspectOrgCmd = menuItem; menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; @@ -632,13 +632,13 @@ static int control(uint32_t request, void *data) [self set_winSizeMult: 2]; if(sender == kFullScreenCmd) { - vo_fs = (!(vo_fs)); + vo_fs = !vo_fs; [self fullscreen:NO]; } if(sender == kKeepAspectCmd) { - vo_keepaspect = (!(vo_keepaspect)); + vo_keepaspect = !vo_keepaspect; if(vo_keepaspect) [kKeepAspectCmd setState:NSOnState]; else @@ -649,7 +649,7 @@ static int control(uint32_t request, void *data) if(sender == kPanScanCmd) { - vo_panscan = (!(vo_panscan)); + vo_panscan = !vo_panscan; if(vo_panscan) [kPanScanCmd setState:NSOnState]; else @@ -763,7 +763,7 @@ static int control(uint32_t request, void *data) //automatically hide mouse cursor (and future on-screen control?) if(isFullscreen && !mouseHide && !isRootwin) { - if( ((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0) ) + if(curTime - lastMouseHide >= 5 || lastMouseHide == 0) { CGDisplayHideCursor(kCGDirectMainDisplay); mouseHide = TRUE; @@ -773,7 +773,7 @@ static int control(uint32_t request, void *data) //update activity every 30 seconds to prevent //screensaver from starting up. - if( ((curTime - lastScreensaverUpdate) >= 30) || (lastScreensaverUpdate == 0) ) + if(curTime - lastScreensaverUpdate >= 30 || lastScreensaverUpdate == 0) { UpdateSystemActivity(UsrActivity); lastScreensaverUpdate = curTime; |