]> git.sesse.net Git - vlc/commitdiff
macosx: Don't name 'Real' the functions that applies to those executed on MainThread.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 12 Jul 2008 11:01:28 +0000 (13:01 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 12 Jul 2008 15:36:27 +0000 (17:36 +0200)
modules/gui/macosx/vout.h
modules/gui/macosx/vout.m

index 38c3025f91c0584659af4d671a8c3e0c5a8c9c3c..66f0a7272376d292b029871192760de6006f0db2 100644 (file)
 
 - (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;
index 1aef599d4e75b3d7d463331fb58e9bd22a5ad553..65822210e5c77aaa77d9a70035edd7589da397ce 100644 (file)
@@ -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 )
     {