[MPlayer-cvslog] r36363 - in trunk/libvo: osx_objc_common.h osx_objc_common.m vo_corevideo.h vo_corevideo.m
upsuper
subversion at mplayerhq.hu
Tue Jul 16 03:33:46 CEST 2013
Author: upsuper
Date: Tue Jul 16 03:33:46 2013
New Revision: 36363
Log:
Fix missing selector name warnings
Rename config method to follow convention of Objective-C.
Patch by Jiang Jiang, gzjjgod gmail com.
Modified:
trunk/libvo/osx_objc_common.h
trunk/libvo/osx_objc_common.m
trunk/libvo/vo_corevideo.h
trunk/libvo/vo_corevideo.m
Modified: trunk/libvo/osx_objc_common.h
==============================================================================
--- trunk/libvo/osx_objc_common.h Sun Jul 14 20:31:15 2013 (r36362)
+++ trunk/libvo/osx_objc_common.h Tue Jul 16 03:33:46 2013 (r36363)
@@ -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;
Modified: trunk/libvo/osx_objc_common.m
==============================================================================
--- trunk/libvo/osx_objc_common.m Sun Jul 14 20:31:15 2013 (r36362)
+++ trunk/libvo/osx_objc_common.m Tue Jul 16 03:33:46 2013 (r36363)
@@ -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;
Modified: trunk/libvo/vo_corevideo.h
==============================================================================
--- trunk/libvo/vo_corevideo.h Sun Jul 14 20:31:15 2013 (r36362)
+++ trunk/libvo/vo_corevideo.h Tue Jul 16 03:33:46 2013 (r36363)
@@ -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;
Modified: trunk/libvo/vo_corevideo.m
==============================================================================
--- trunk/libvo/vo_corevideo.m Sun Jul 14 20:31:15 2013 (r36362)
+++ trunk/libvo/vo_corevideo.m Tue Jul 16 03:33:46 2013 (r36363)
@@ -160,7 +160,7 @@ static int config(uint32_t width, uint32
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 +440,11 @@ static int control(uint32_t request, voi
[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]);
More information about the MPlayer-cvslog
mailing list