Mercurial > mplayer.hg

changeset 29272:c95bad660986

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When used with shared_buffer, there's no need for a NSApp object, which causes MPlayer to be marked as unresponsive.
author adrian
date Mon, 18 May 2009 21:19:11 +0000
parents 82b6fbc72099
children 69304fca8564
files libvo/vo_corevideo.m
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_corevideo.m	Mon May 18 21:00:35 2009 +0000
+++ b/libvo/vo_corevideo.m	Mon May 18 21:19:11 2009 +0000
@@ -230,7 +230,8 @@
 
 static void check_events(void)
 {
-	[mpGLView check_events];
+	if (mpGLView)
+		[mpGLView check_events];
 }
 
 static void draw_osd(void)
@@ -370,10 +371,7 @@
 		return -1;
 	}
 
-	NSApplicationLoad();
 	autoreleasepool = [[NSAutoreleasePool alloc] init];
-	NSApp = [NSApplication sharedApplication];
-	isLeopardOrLater = floor(NSAppKitVersionNumber) > 824;
 
 	if (!buffer_name)
 		buffer_name = strdup(DEFAULT_BUFFER_NAME);
@@ -382,6 +380,10 @@
 
 	if(!shared_buffer)
 	{
+		NSApplicationLoad();
+		NSApp = [NSApplication sharedApplication];
+		isLeopardOrLater = floor(NSAppKitVersionNumber) > 824;
+
 		#if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL)
 		//this chunk of code is heavily based off SDL_macosx.m from SDL
 		ProcessSerialNumber myProc, frProc;