Skip to content

V
vlc
Commit 985ad1a4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx/bookmarks: remove explicit singleton

parent 1a5b701e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 18 deletions
modules/gui/macosx/MainMenu.m
View file @ 985ad1a4
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
VLCVideoEffects *_videoEffectsWindowController; VLCVideoEffects *_videoEffectsWindowController;
VLCAudioEffects *_audioEffectsWindowController; VLCAudioEffects *_audioEffectsWindowController;
VLCTrackSynchronization *_trackSynchronizationWindowController; VLCTrackSynchronization *_trackSynchronizationWindowController;
VLCBookmarks *_bookmarksWindowController;
VLCConvertAndSave *_convertAndSaveWindowController; VLCConvertAndSave *_convertAndSaveWindowController;
AddonsWindowController *_addonsController; AddonsWindowController *_addonsController;
......
modules/gui/macosx/VLCVoutWindowController.m
View file @ 985ad1a4
...@@ -599,14 +599,14 @@ void WindowClose(vout_window_t *p_wnd) ...@@ -599,14 +599,14 @@ void WindowClose(vout_window_t *p_wnd)
NSInteger currentStatusWindowLevel = self.currentStatusWindowLevel; NSInteger currentStatusWindowLevel = self.currentStatusWindowLevel;
VLCMain *main = [VLCMain sharedInstance];
[[VLCMainWindow sharedInstance] setWindowLevel:i_level]; [[VLCMainWindow sharedInstance] setWindowLevel:i_level];
[[VLCVideoEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel]; [[VLCVideoEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
[[VLCAudioEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel]; [[VLCAudioEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
[[VLCInfo sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel]; [[VLCInfo sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
[[VLCBookmarks sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel]; [[main bookmarks] updateCocoaWindowLevel:currentStatusWindowLevel];
[[VLCTrackSynchronization sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel]; [[VLCTrackSynchronization sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
[[[VLCMain sharedInstance] resumeDialog] updateCocoaWindowLevel:currentStatusWindowLevel]; [[main resumeDialog] updateCocoaWindowLevel:currentStatusWindowLevel];
} }
@end @end
modules/gui/macosx/bookmarks.h
View file @ 985ad1a4
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
@interface VLCBookmarks : NSObject @interface VLCBookmarks : NSObject
+ (VLCBookmarks *)sharedInstance;
/* main window */ /* main window */
@property (readwrite, weak) IBOutlet NSWindow *bookmarksWindow; @property (readwrite, weak) IBOutlet NSWindow *bookmarksWindow;
@property (readwrite, weak) IBOutlet NSButton *addButton; @property (readwrite, weak) IBOutlet NSButton *addButton;
......
modules/gui/macosx/bookmarks.m
View file @ 985ad1a4
...@@ -45,18 +45,6 @@ ...@@ -45,18 +45,6 @@
@implementation VLCBookmarks @implementation VLCBookmarks
+ (VLCBookmarks *)sharedInstance
{
static VLCBookmarks *sharedInstance = nil;
static dispatch_once_t pred;
dispatch_once(&pred, ^{
sharedInstance = [VLCBookmarks new];
});
return sharedInstance;
}
/***************************************************************************** /*****************************************************************************
* GUI methods * GUI methods
*****************************************************************************/ *****************************************************************************/
......
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