macosx: Add extensions menu entry

Adds an entry to the 'VLC' menu for extensions, which is then auto-populated.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit ced48b310db5f137084e0fcc1783c1ac006a96f3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/gui/macosx/MainMenu.h

@@ -41,11 +41,15 @@
     id o_trackSynchronization;  /* VLCTrackSynchronization */
     id o_bookmarks;             /* VLCBookmarks */
 
+    id o_extMgr;                /* Extensions Manager */
+
     /* main menu */
 
     IBOutlet NSMenuItem * o_mi_about;
     IBOutlet NSMenuItem * o_mi_prefs;
     IBOutlet NSMenuItem * o_mi_checkForUpdate;
+    IBOutlet NSMenuItem * o_mi_extensions;
+    IBOutlet NSMenu * o_mu_extensions;
     IBOutlet NSMenuItem * o_mi_add_intf;
     IBOutlet NSMenu * o_mu_add_intf;
     IBOutlet NSMenuItem * o_mi_services;
@@ -196,6 +200,7 @@
 - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification;
 - (void)setSubmenusEnabled:(BOOL)b_enabled;
 - (void)setRateControlsEnabled:(BOOL)b_enabled;
+- (void)setupExtensionsMenu;
 
 - (IBAction)intfOpenFile:(id)sender;
 - (IBAction)intfOpenFileGeneric:(id)sender;

modules/gui/macosx/MainMenu.m

@@ -40,6 +40,7 @@
 #import "VideoView.h"
 #import "CoreInteraction.h"
 #import "MainWindow.h"
+#import "ExtensionsManager.h"
 
 @implementation VLCMainMenu
 static VLCMainMenu *_o_sharedInstance = nil;
@@ -83,6 +84,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
     if (b_nib_tracksynchro_loaded)
         [o_trackSynchronization release];
 
+    [o_extMgr release];
+
     [super dealloc];
 }
 
@@ -108,6 +111,10 @@ static VLCMainMenu *_o_sharedInstance = nil;
      because VLCMain is the owner */
     if( b_mainMenu_setup ) return;
 
+    /* Get ExtensionsManager */
+    o_extMgr = [ExtensionsManager getInstance:p_intf];
+    [o_extMgr retain];
+
     [self initStrings];
 
     key = config_GetPsz( p_intf, "key-quit" );
@@ -218,6 +225,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
 
     [self setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
                              var: "intf-add" selector: @selector(toggleVar:)];
+
+    [self setupExtensionsMenu];
 }
 
 - (void)initStrings
@@ -251,6 +260,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
     [o_mi_clear setTitle: _NS("Clear")];
     [o_mi_select_all setTitle: _NS("Select All")];
 
+    [o_mu_extensions setTitle: _NS("Extensions")];
+
     [o_mu_controls setTitle: _NS("Playback")];
     [o_mi_play setTitle: _NS("Play")];
     [o_mi_stop setTitle: _NS("Stop")];
@@ -548,6 +559,29 @@ static VLCMainMenu *_o_sharedInstance = nil;
     [o_pool release];
 }
 
+#pragma mark -
+#pragma mark Extensions
+
+- (void)setupExtensionsMenu
+{
+    /* Load extensions if needed */
+    // TODO: Implement preference for autoloading extensions on mac
+
+    // if( !var_InheritBool( p_intf, "qt-autoload-extensions")
+    //     && ![o_extMgr isLoaded] )
+    // {
+    //     return;
+    // }
+
+    if( ![o_extMgr isLoaded] && ![o_extMgr cannotLoad] )
+    {
+        [o_extMgr loadExtensions];
+    }
+
+    /* Let the ExtensionsManager itself build the menu */
+    [o_extMgr buildMenu:o_mu_extensions];
+}
+
 #pragma mark -
 #pragma mark Playback
 - (IBAction)toggleRecord:(id)sender