[vlc-devel] commit: macosx: Don't name 'Real' the functions that applies to those executed on MainThread. (Pierre d' Herbemont )

git version control git at videolan.org
Sat Jul 12 17:34:12 CEST 2008


vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat Jul 12 13:01:28 2008 +0200| [faae87f60cdb42ba6db73a3c03a6f7e9040303cd]

macosx: Don't name 'Real' the functions that applies to those executed on MainThread.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=faae87f60cdb42ba6db73a3c03a6f7e9040303cd
---

 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 38c3025..66f0a72 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 1aef599..6582221 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 )
     {




More information about the vlc-devel mailing list