From 1e94c915a2a6949b641c0650cd56d1dc7478dd3d Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 7 Mar 2009 13:45:48 +0000 Subject: cosmetics: Reformat file header. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28871 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_macosx.m | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libvo/vo_macosx.m') diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 1cd1d43b76..040ae19097 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -1,4 +1,7 @@ /* + * Mac OS X video output driver + * Copyright (c) 2005 Nicolas Plourde + * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify @@ -16,14 +19,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* - vo_macosx.m - by Nicolas Plourde - - MPlayer Mac OSX video out module. - Copyright (c) Nicolas Plourde - 2005 -*/ - #import "vo_macosx.h" #include #include -- cgit v1.2.3 From 41bd5a75fd9611b79f4fae56743021d36df6e89f Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 7 Mar 2009 17:41:34 +0000 Subject: cosmetics: spelling fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28872 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_macosx.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libvo/vo_macosx.m') diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 040ae19097..8a238191c7 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -95,7 +95,7 @@ static BOOL isLeopardOrLater; static vo_info_t info = { - "Mac OSX Core Video", + "Mac OS X Core Video", "macosx", "Nicolas Plourde ", "" @@ -127,7 +127,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ } else { - mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d do not exist, falling back to main device.\n", screen_id); + mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d does not exist, falling back to main device.\n", screen_id); screen_handle = [screen_array objectAtIndex:0]; screen_id = -1; } @@ -212,7 +212,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ return 1; } - //connnect to mplayerosx + //connect to mplayerosx mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:[NSString stringWithCString:buffer_name] host:nil]; if ([mplayerosxProxy conformsToProtocol:@protocol(MPlayerOSXVOProto)]) { [mplayerosxProxy setProtocolForProxy:@protocol(MPlayerOSXVOProto)]; @@ -357,7 +357,7 @@ static int preinit(const char *arg) "Example: mplayer -vo macosx:device_id=1:shared_buffer:buffer_name=mybuff\n" "\nOptions:\n" " device_id=<0-...>\n" - " Set screen device id for fullscreen.\n" + " Set screen device ID for fullscreen.\n" " shared_buffer\n" " Write output to a shared memory buffer instead of displaying it.\n" " buffer_name=\n" @@ -808,7 +808,7 @@ static int control(uint32_t request, void *data, ...) curTime = TickCount()/60; - //auto hide mouse cursor (and future on-screen control?) + //automatically hide mouse cursor (and future on-screen control?) if(isFullscreen && !mouseHide && !isRootwin) { if( ((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0) ) @@ -959,8 +959,8 @@ static int control(uint32_t request, void *data, ...) return; [NSApp sendEvent:event]; // Without SDL's bootstrap code (include SDL.h in mplayer.c), - // on Leopard, we got trouble to get the play window auto focused - // when app is actived. Following code fix this problem. + // on Leopard, we have trouble to get the play window automatically focused + // when the app is actived. The Following code fix this problem. #ifndef CONFIG_SDL if (isLeopardOrLater && [event type] == NSAppKitDefined && [event subtype] == NSApplicationActivatedEventType) { -- cgit v1.2.3