Commit 1a5b701e authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: simplify

parent e85d470c
...@@ -67,12 +67,6 @@ ...@@ -67,12 +67,6 @@
#import <Sparkle/Sparkle.h> /* we're the update delegate */ #import <Sparkle/Sparkle.h> /* we're the update delegate */
#endif #endif
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static VLCMain *sharedInstance = nil;
#pragma mark - #pragma mark -
#pragma mark VLC Interface Object Callbacks #pragma mark VLC Interface Object Callbacks
...@@ -100,7 +94,6 @@ void CloseIntf (vlc_object_t *p_this) ...@@ -100,7 +94,6 @@ void CloseIntf (vlc_object_t *p_this)
@autoreleasepool { @autoreleasepool {
msg_Dbg(p_this, "Closing macosx interface"); msg_Dbg(p_this, "Closing macosx interface");
[[VLCMain sharedInstance] applicationWillTerminate:nil]; [[VLCMain sharedInstance] applicationWillTerminate:nil];
sharedInstance = nil;
} }
} }
...@@ -178,6 +171,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable, ...@@ -178,6 +171,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
+ (VLCMain *)sharedInstance + (VLCMain *)sharedInstance
{ {
static VLCMain *sharedInstance = nil;
static dispatch_once_t pred; static dispatch_once_t pred;
dispatch_once(&pred, ^{ dispatch_once(&pred, ^{
...@@ -191,6 +185,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable, ...@@ -191,6 +185,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
{ {
self = [super init]; self = [super init];
if (self) {
p_intf = NULL; p_intf = NULL;
[VLCApplication sharedApplication].delegate = self; [VLCApplication sharedApplication].delegate = self;
...@@ -206,23 +201,11 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable, ...@@ -206,23 +201,11 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
[defaults registerDefaults:appDefaults]; [defaults registerDefaults:appDefaults];
_voutController = [[VLCVoutWindowController alloc] init]; _voutController = [[VLCVoutWindowController alloc] init];
}
return self; return self;
} }
- (void)dealloc
{
_mainmenu = nil;
_prefs = nil;
_sprefs = nil;
_open = nil;
_coredialogs = nil;
_bookmarks = nil;
_coreinteraction = nil;
_resume_dialog = nil;
_input_manager = nil;
}
- (void)setIntf: (intf_thread_t *)p_mainintf - (void)setIntf: (intf_thread_t *)p_mainintf
{ {
p_intf = p_mainintf; p_intf = p_mainintf;
......
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