macosx/bookmarks: remove explicit singleton

modules/gui/macosx/MainMenu.m

@@ -65,7 +65,6 @@
     VLCVideoEffects *_videoEffectsWindowController;
     VLCAudioEffects *_audioEffectsWindowController;
     VLCTrackSynchronization *_trackSynchronizationWindowController;
-    VLCBookmarks *_bookmarksWindowController;
     VLCConvertAndSave *_convertAndSaveWindowController;
     AddonsWindowController *_addonsController;
 

modules/gui/macosx/VLCVoutWindowController.m

@@ -599,14 +599,14 @@ void WindowClose(vout_window_t *p_wnd)
 
     NSInteger currentStatusWindowLevel = self.currentStatusWindowLevel;
 
+    VLCMain *main = [VLCMain sharedInstance];
     [[VLCMainWindow sharedInstance] setWindowLevel:i_level];
-
     [[VLCVideoEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
     [[VLCAudioEffects sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
     [[VLCInfo sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
-    [[VLCBookmarks sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[main bookmarks] updateCocoaWindowLevel:currentStatusWindowLevel];
     [[VLCTrackSynchronization sharedInstance] updateCocoaWindowLevel:currentStatusWindowLevel];
-    [[[VLCMain sharedInstance] resumeDialog] updateCocoaWindowLevel:currentStatusWindowLevel];
+    [[main resumeDialog] updateCocoaWindowLevel:currentStatusWindowLevel];
 }
 
 @end

modules/gui/macosx/bookmarks.h

@@ -27,8 +27,6 @@
 
 @interface VLCBookmarks : NSObject
 
-+ (VLCBookmarks *)sharedInstance;
-
 /* main window */
 @property (readwrite, weak) IBOutlet NSWindow *bookmarksWindow;
 @property (readwrite, weak) IBOutlet NSButton *addButton;

modules/gui/macosx/bookmarks.m

@@ -45,18 +45,6 @@
 
 @implementation VLCBookmarks
 
-+ (VLCBookmarks *)sharedInstance
-{
-    static VLCBookmarks *sharedInstance = nil;
-    static dispatch_once_t pred;
-
-    dispatch_once(&pred, ^{
-        sharedInstance = [VLCBookmarks new];
-    });
-
-    return sharedInstance;
-}
-
 /*****************************************************************************
  * GUI methods
  *****************************************************************************/