Mercurial > mplayer.hg

changeset 36267:f51965824a2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix missing selector name warnings Rename config method to follow convention of Objective-C. Patch by Jiang Jiang, gzjjgod gmail com.
author upsuper
date Tue, 16 Jul 2013 01:33:46 +0000
parents 29b462786834
children 1d34ea86b892
files libvo/osx_objc_common.h libvo/osx_objc_common.m libvo/vo_corevideo.h libvo/vo_corevideo.m
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/osx_objc_common.h	Sun Jul 14 18:31:15 2013 +0000
+++ b/libvo/osx_objc_common.h	Tue Jul 16 01:33:46 2013 +0000
@@ -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;
 
--- a/libvo/osx_objc_common.m	Sun Jul 14 18:31:15 2013 +0000
+++ b/libvo/osx_objc_common.m	Tue Jul 16 01:33:46 2013 +0000
@@ -73,7 +73,7 @@
 
 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 @@
 	[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;
--- a/libvo/vo_corevideo.h	Sun Jul 14 18:31:15 2013 +0000
+++ b/libvo/vo_corevideo.h	Tue Jul 16 01:33:46 2013 +0000
@@ -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;
--- a/libvo/vo_corevideo.m	Sun Jul 14 18:31:15 2013 +0000
+++ b/libvo/vo_corevideo.m	Tue Jul 16 01:33:46 2013 +0000
@@ -160,7 +160,7 @@
 		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 @@
 	[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]);