From faae87f60cdb42ba6db73a3c03a6f7e9040303cd Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Sat, 12 Jul 2008 13:01:28 +0200 Subject: [PATCH] macosx: Don't name 'Real' the functions that applies to those executed on MainThread. --- modules/gui/macosx/vout.h | 4 ++-- modules/gui/macosx/vout.m | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h index 38c3025f91..66f0a72723 100644 --- a/modules/gui/macosx/vout.h +++ b/modules/gui/macosx/vout.h @@ -127,10 +127,10 @@ - (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view frame: (NSRect *) s_frame; -- (id)initReal: (id) sender; +- (id)initMainThread: (id) sender; - (void)close; - (void)closeWindow; -- (id)closeReal: (id) sender; +- (id)closeMainThread: (id) sender; - (id)getVoutView; - (BOOL)windowShouldClose:(id)sender; diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 1aef599d4e..65822210e5 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -1009,7 +1009,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, o_view = view; s_frame = frame; - [self performSelectorOnMainThread: @selector(initReal:) + [self performSelectorOnMainThread: @selector(initMainThread:) withObject: NULL waitUntilDone: YES]; if( !b_init_ok ) @@ -1020,7 +1020,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, return self; } -- (id)initReal: (id) sender +- (id)initMainThread: (id) sender { NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSArray *o_screens = [NSScreen screens]; @@ -1149,11 +1149,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, { /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting Command-Q */ - [self performSelectorOnMainThread: @selector(closeReal:) + [self performSelectorOnMainThread: @selector(closeMainThread:) withObject: NULL waitUntilDone: NO]; } -- (id)closeReal:(id)sender +- (id)closeMainThread:(id)sender { if( b_black == true ) { -- 2.39.5