[MPlayer-dev-eng] [PATCH 2/3] Fix some warnings with Objective-C code and declarations

[Xidorn Quan]

On Sun, Jul 14, 2013 at 8:38 PM, Jiang Jiang <gzjjgod at gmail.com> wrote:

> ---
>  libvo/osx_objc_common.h | 2 +-
>  libvo/osx_objc_common.m | 4 ++--
>  libvo/vo_corevideo.h    | 2 +-
>  libvo/vo_corevideo.m    | 7 ++++---
>  4 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/libvo/osx_objc_common.h b/libvo/osx_objc_common.h
> index a0e49f6..c9cd65f 100644
> --- a/libvo/osx_objc_common.h
> +++ b/libvo/osx_objc_common.h
> @@ -62,7 +62,7 @@
>
>  //window & rendering
>  - (void) preinit;
> -- (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags;
> +- (void) configWidth: (uint32_t) width height: (uint32_t) height flags:
> (uint32_t)flags;
>  - (void) drawRect: (NSRect *) bounds;
>  - (void) reshape;
>
> diff --git a/libvo/osx_objc_common.m b/libvo/osx_objc_common.m
> index 17a6fec..35d1e33 100644
> --- a/libvo/osx_objc_common.m
> +++ b/libvo/osx_objc_common.m
> @@ -73,7 +73,7 @@ void vo_osx_uninit(void)
>
>  int vo_osx_config(uint32_t width, uint32_t height, uint32_t flags)
>  {
> -    [oglv config:width:height:flags];
> +    [oglv configWidth:width height:height flags:flags];
>      return 1;
>  }
>
> @@ -183,7 +183,7 @@ void vo_osx_swap_buffers(void)
>         [super dealloc];
>  }
>
> -- (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags
> +- (void) configWidth:(uint32_t)width height:(uint32_t)height
> flags:(uint32_t)flags
>  {
>         if (flags & VOFLAG_HIDDEN)
>                 return;
> diff --git a/libvo/vo_corevideo.h b/libvo/vo_corevideo.h
> index e1a7229..8bab3c3 100644
> --- a/libvo/vo_corevideo.h
> +++ b/libvo/vo_corevideo.h
> @@ -56,7 +56,7 @@
>
>  //window & rendering
>  - (void) preinit;
> -- (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags;
> +- (void) configWidth: (uint32_t) width height: (uint32_t) height flags:
> (uint32_t)flags;
>  - (void) prepareOpenGL;
>  - (void) render;
>  - (void) reshape;
> diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
> index 603c004..b375af7 100644
> --- a/libvo/vo_corevideo.m
> +++ b/libvo/vo_corevideo.m
> @@ -25,6 +25,7 @@
>  #include <sys/mman.h>
>  #include <unistd.h>
>  #include <CoreServices/CoreServices.h>
> +#include <OpenGL/gl.h>
>  //special workaround for Apple bug #6267445
>  //(OSServices Power API disabled in OSServices.h for 64bit systems)
>  #ifndef __POWER__
> @@ -160,7 +161,7 @@ static int config(uint32_t width, uint32_t height,
> uint32_t d_width, uint32_t d_
>                 image_page = 0;
>
>                 //config OpenGL View
> -               [mpGLView config:d_width:d_height:flags];
> +               [mpGLView configWidth:d_width height:d_height flags:flags];
>                 [mpGLView reshape];
>                 [[mpGLView window] setTitle:[NSString
> stringWithUTF8String:vo_wintitle ? vo_wintitle : title]];
>         }
> @@ -440,11 +441,11 @@ static int control(uint32_t request, void *data)
>         [super dealloc];
>  }
>
> -- (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags
> +- (void) configWidth:(uint32_t)width height:(uint32_t)height
> flags:(uint32_t)flags
>  {
>         CVReturn error = kCVReturnSuccess;
>
> -       [super config:width:height:flags];
> +       [super configWidth:width height:height flags:flags];
>
>         [self releaseVideoSpecific];
>         error = CVPixelBufferCreateWithBytes(NULL, image_width,
> image_height, pixelFormat, image_datas[0], image_stride, NULL, NULL, NULL,
> &frameBuffers[0]);
> --
> 1.8.3.1 (Apple Git-46)
>

LGTM.

-- 
Xidorn Quan
GnuPG fingerprint: 6F1E DF9A D250 7505 63E2  345E 7570 8D3F 7C9A 1209