July 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r31809 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:53:44 2010 New Revision: 31809 Log: Avoid some code duplication. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:49:36 2010 (r31808) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:53:44 2010 (r31809) @@ -498,10 +498,8 @@ static int control(uint32_t request, voi // Use visibleFrame to position the window taking the menu bar and dock into account. // Also flip vo_dy since the screen origin is in the bottom left on OSX. - if (screen_id < 0) - visibleFrame = [[[mpGLView window] screen] visibleFrame]; - else - visibleFrame = [[[NSScreen screens] objectAtIndex:screen_id] visibleFrame]; + update_screen_info(); + visibleFrame = [screen_handle visibleFrame]; [window setFrameTopLeftPoint:NSMakePoint( visibleFrame.origin.x + vo_dx, visibleFrame.origin.y + visibleFrame.size.height - vo_dy)];

1 0

r31808 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:49:36 2010 New Revision: 31808 Log: Cosmetics: indentation fixes. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:44:57 2010 (r31807) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:49:36 2010 (r31808) @@ -130,7 +130,7 @@ static void update_screen_info(void) if (screen_id < 0 && [mpGLView window]) screen_handle = [[mpGLView window] screen]; else - screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; + screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; screen_frame = [screen_handle frame]; vo_screenwidth = screen_frame.size.width; @@ -450,7 +450,7 @@ static int control(uint32_t request, voi [window setContentView:mpGLView]; [window setInitialFirstResponder:mpGLView]; [window setAcceptsMouseMovedEvents:YES]; - [window setTitle:@"MPlayer - The Movie Player"]; + [window setTitle:@"MPlayer - The Movie Player"]; isFullscreen = 0; winSizeMult = 1; @@ -555,24 +555,24 @@ static int control(uint32_t request, voi kFullScreenCmd = 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]; - if(vo_keepaspect) [menuItem setState:NSOnState]; - kKeepAspectCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - if(vo_panscan) [menuItem setState:NSOnState]; - kPanScanCmd = 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]; - kAspectFullCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - kAspectWideCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; - [menuItem setSubmenu:aspectMenu]; - [menu addItem:menuItem]; - [aspectMenu release]; + aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; + menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; + if(vo_keepaspect) [menuItem setState:NSOnState]; + kKeepAspectCmd = menuItem; + menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; + if(vo_panscan) [menuItem setState:NSOnState]; + kPanScanCmd = 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]; + kAspectFullCmd = menuItem; + menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; + kAspectWideCmd = menuItem; + menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; + [menuItem setSubmenu:aspectMenu]; + [menu addItem:menuItem]; + [aspectMenu release]; //Add to menubar menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; @@ -921,10 +921,10 @@ static int control(uint32_t request, voi - (BOOL)performKeyEquivalent:(NSEvent *)theEvent { switch([theEvent keyCode]) - { + { case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES; case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES; - } + } return NO; } @@ -1041,7 +1041,7 @@ static int control(uint32_t request, voi - (void)windowWillClose:(NSNotification *)aNotification { - mpGLView = NULL; + mpGLView = NULL; mplayer_put_key(KEY_CLOSE_WIN); } @end

1 0

r31807 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:44:57 2010 New Revision: 31807 Log: Avoid some code duplication in update_screen_info. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:38:45 2010 (r31806) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:44:57 2010 (r31807) @@ -127,9 +127,12 @@ static void update_screen_info(void) mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id); screen_id = -1; } + if (screen_id < 0 && [mpGLView window]) + screen_handle = [[mpGLView window] screen]; + else screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; - screen_frame = ![mpGLView window] || screen_id >= 0 ? [screen_handle frame] : [[[mpGLView window] screen] frame]; + screen_frame = [screen_handle frame]; vo_screenwidth = screen_frame.size.width; vo_screenheight = screen_frame.size.height; xinerama_x = xinerama_y = 0;

1 0

r31806 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:38:45 2010 New Revision: 31806 Log: Simplify update_screen_info. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:19:41 2010 (r31805) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:38:45 2010 (r31806) @@ -122,16 +122,12 @@ static void update_screen_info(void) screen_id = xinerama_screen; screen_array = [NSScreen screens]; - if(screen_id < (int)[screen_array count]) - { - screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; - } - else + if(screen_id >= (int)[screen_array count]) { mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id); - screen_handle = [screen_array objectAtIndex:0]; screen_id = -1; } + screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; screen_frame = ![mpGLView window] || screen_id >= 0 ? [screen_handle frame] : [[[mpGLView window] screen] frame]; vo_screenwidth = screen_frame.size.width;

1 0

r31805 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:19:41 2010 New Revision: 31805 Log: Declare variables with proper types to avoid dangerous pointer casts. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:18:04 2010 (r31804) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:19:41 2010 (r31805) @@ -685,8 +685,7 @@ static int control(uint32_t request, voi */ - (void)reshape { - uint32_t d_width; - uint32_t d_height; + int d_width, d_height; NSRect frame = [self frame]; vo_dwidth = frame.size.width; @@ -702,7 +701,7 @@ static int control(uint32_t request, voi //set texture frame if(vo_keepaspect) { - aspect( (int *)&d_width, (int *)&d_height, A_WINZOOM); + aspect(&d_width, &d_height, A_WINZOOM); textureFrame = NSMakeRect((vo_dwidth - d_width) / 2, (vo_dheight - d_height) / 2, d_width, d_height); }

1 0

r31804 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:18:04 2010 New Revision: 31804 Log: Remove pointless casts. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:16:40 2010 (r31803) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:18:04 2010 (r31804) @@ -554,7 +554,7 @@ static int control(uint32_t request, voi 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, voi 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];

1 0

r31803 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:16:40 2010 New Revision: 31803 Log: Remove yet more useless () Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:14:07 2010 (r31802) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:16:40 2010 (r31803) @@ -417,10 +417,10 @@ static int control(uint32_t request, voi 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;

1 0

r31802 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:14:07 2010 New Revision: 31802 Log: Remove useless (). Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 13:07:15 2010 (r31801) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:14:07 2010 (r31802) @@ -632,13 +632,13 @@ static int control(uint32_t request, voi [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, voi 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, voi //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, voi //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;

1 0

r31801 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 13:07:15 2010 New Revision: 31801 Log: Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested corevideo to quit, KEY_ESC might have been rebound to something else. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 11:47:06 2010 (r31800) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 13:07:15 2010 (r31801) @@ -621,7 +621,7 @@ static int control(uint32_t request, voi { if(sender == kQuitCmd) { - mplayer_put_key(KEY_ESC); + mplayer_put_key(KEY_CLOSE_WIN); } if(sender == kHalfScreenCmd) @@ -1044,6 +1044,6 @@ static int control(uint32_t request, voi - (void)windowWillClose:(NSNotification *)aNotification { mpGLView = NULL; - mplayer_put_key(KEY_ESC); + mplayer_put_key(KEY_CLOSE_WIN); } @end

1 0

r31800 - trunk/spudec.c
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 11:47:06 2010 New Revision: 31800 Log: Remove unused variables. Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Sun Jul 25 11:41:30 2010 (r31799) +++ trunk/spudec.c Sun Jul 25 11:47:06 2010 (r31800) @@ -179,8 +179,6 @@ static inline void spudec_cut_image(spud { unsigned int fy, ly; unsigned int first_y, last_y; - unsigned char *image; - unsigned char *aimage; if (this->stride == 0 || this->height == 0) { return;

1 0