[MPlayer-cvslog] CVS: main/libvo vo_macosx.m,1.12,1.13

Nicolas Plourde CVS syncmail at mplayerhq.hu
Sun Jun 5 16:57:38 CEST 2005


CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv3719/libvo

Modified Files:
	vo_macosx.m 
Log Message:
Pure cosmetic


Index: vo_macosx.m
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_macosx.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_macosx.m	2 Jun 2005 14:19:35 -0000	1.12
+++ vo_macosx.m	5 Jun 2005 14:57:36 -0000	1.13
@@ -22,8 +22,6 @@
 
 #include "osdep/keycodes.h"
 
-extern void mplayer_put_key(int code);
-
 //Cocoa
 MPlayerOpenGLView *mpGLView;
 NSAutoreleasePool *autoreleasepool;
@@ -297,8 +295,7 @@
 	//create window
 	window = [[NSWindow alloc]	initWithContentRect:NSMakeRect(0, 0, frame.size.width, frame.size.height) 
 								styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask
-								backing:NSBackingStoreBuffered
-								defer:NO];
+								backing:NSBackingStoreBuffered defer:NO];
 
 	[window setDelegate:self];
 	[window setContentView:self];
@@ -308,18 +305,13 @@
 	[window center];
 	[window makeKeyAndOrderFront:self];
 	
+	
 	[self setOpenGLContext:glContext];
-	[[self openGLContext] setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
+	[glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
 	[glContext setView:self];
 	[glContext makeCurrentContext];	
 	
-	error = CVPixelBufferCreateWithBytes(	NULL,
-											image_width, image_height,
-											pixelFormat,
-											image_data,
-											image_width*image_bytes,
-											NULL, NULL, NULL,
-											&currentFrameBuffer);
+	error = CVPixelBufferCreateWithBytes( NULL, image_width, image_height, pixelFormat, image_data, image_width*image_bytes, NULL, NULL, NULL, &currentFrameBuffer);
 	if(error != kCVReturnSuccess)
 		mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Buffer(%d)\n", error);
 	




More information about the MPlayer-cvslog mailing list