Commit faae87f6 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

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

parent 4168ec37
...@@ -127,10 +127,10 @@ ...@@ -127,10 +127,10 @@
- (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view - (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view
frame: (NSRect *) s_frame; frame: (NSRect *) s_frame;
- (id)initReal: (id) sender; - (id)initMainThread: (id) sender;
- (void)close; - (void)close;
- (void)closeWindow; - (void)closeWindow;
- (id)closeReal: (id) sender; - (id)closeMainThread: (id) sender;
- (id)getVoutView; - (id)getVoutView;
- (BOOL)windowShouldClose:(id)sender; - (BOOL)windowShouldClose:(id)sender;
......
...@@ -1009,7 +1009,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1009,7 +1009,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
o_view = view; o_view = view;
s_frame = frame; s_frame = frame;
[self performSelectorOnMainThread: @selector(initReal:) [self performSelectorOnMainThread: @selector(initMainThread:)
withObject: NULL waitUntilDone: YES]; withObject: NULL waitUntilDone: YES];
if( !b_init_ok ) if( !b_init_ok )
...@@ -1020,7 +1020,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1020,7 +1020,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
return self; return self;
} }
- (id)initReal: (id) sender - (id)initMainThread: (id) sender
{ {
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
NSArray *o_screens = [NSScreen screens]; NSArray *o_screens = [NSScreen screens];
...@@ -1149,11 +1149,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -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 /* XXX waitUntilDone = NO to avoid a possible deadlock when hitting
Command-Q */ Command-Q */
[self performSelectorOnMainThread: @selector(closeReal:) [self performSelectorOnMainThread: @selector(closeMainThread:)
withObject: NULL waitUntilDone: NO]; withObject: NULL waitUntilDone: NO];
} }
- (id)closeReal:(id)sender - (id)closeMainThread:(id)sender
{ {
if( b_black == true ) if( b_black == true )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment