# HG changeset patch # User reimar # Date 1347391338 0 # Node ID e91f5bd3214df0c733d7e0c2edba2995b19d4435 # Parent 9aa803767e6ac3d44a2a7f234934e2ff64d8ece6 Consistently use "self" instead of a global variable. diff -r 9aa803767e6a -r e91f5bd3214d libvo/vo_corevideo.m --- a/libvo/vo_corevideo.m Tue Sep 11 19:15:10 2012 +0000 +++ b/libvo/vo_corevideo.m Tue Sep 11 19:22:18 2012 +0000 @@ -481,9 +481,9 @@ backing:NSBackingStoreBuffered defer:NO]; [window autorelease]; - [window setDelegate:mpGLView]; - [window setContentView:mpGLView]; - [window setInitialFirstResponder:mpGLView]; + [window setDelegate:self]; + [window setContentView:self]; + [window setInitialFirstResponder:self]; [window setAcceptsMouseMovedEvents:YES]; [window setTitle:@"MPlayer - The Movie Player"]; @@ -554,16 +554,16 @@ mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL texture(%d)\n", error); //show window - [window makeKeyAndOrderFront:mpGLView]; + [window makeKeyAndOrderFront:self]; if(vo_rootwin) - [mpGLView rootwin]; + [self rootwin]; if(vo_fs) - [mpGLView fullscreen: NO]; + [self fullscreen: NO]; if(vo_ontop) - [mpGLView ontop]; + [self ontop]; } /* @@ -937,7 +937,7 @@ if (isLeopardOrLater && [event type] == NSAppKitDefined && [event subtype] == NSApplicationActivatedEventType) { [window makeMainWindow]; - [window makeKeyAndOrderFront:mpGLView]; + [window makeKeyAndOrderFront:self]; } #endif }