* mirrored the 'services discovery' menu in the file menu -- the flags...

* mirrored the 'services discovery' menu in the file menu -- the flags indicating the running services are partially broken (you do only see them at the same position as you activated the service). I'll fix that after the WE

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -265,6 +265,8 @@
                 "o_mi_services" = id; 
                 "o_mi_sort_author" = id; 
                 "o_mi_sort_name" = id; 
+                "o_mm_mi_services" = id; 
+                "o_mm_mu_services" = id; 
                 "o_mu_services" = id; 
                 "o_outline_view" = id; 
                 "o_playlist_view" = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>78 314 505 517 0 0 1280 938 </string>
+	<string>186 61 505 517 0 0 800 578 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
 		<string>542 480 104 149 0 0 1024 746 </string>
 		<key>2197</key>
-		<string>342 573 596 143 0 0 1280 938 </string>
+		<string>102 333 596 143 0 0 800 578 </string>
 		<key>29</key>
-		<string>132 749 419 44 0 0 1280 938 </string>
+		<string>45 534 419 44 0 0 800 578 </string>
 		<key>915</key>
-		<string>731 416 165 180 0 0 1024 746 </string>
+		<string>537 285 178 211 0 0 800 578 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>364.0</string>
@@ -21,8 +21,10 @@
 	<array/>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2197</integer>
 		<integer>21</integer>
+		<integer>2197</integer>
+		<integer>29</integer>
+		<integer>915</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>7U16</string>

modules/gui/macosx/playlist.h

@@ -57,9 +57,14 @@
     IBOutlet id o_mi_selectall;
     IBOutlet id o_mi_sort_name;
     IBOutlet id o_mi_sort_author;
+    
+    /* "services discovery" menu in the playlist menu */
     IBOutlet id o_mi_services;
-
     IBOutlet id o_mu_services;
+    
+    /* "services discovery" menu in the main menu */
+    IBOutlet id o_mm_mi_services;
+    IBOutlet id o_mm_mu_services;
 
     NSImage *o_descendingSortingImage;
     NSImage *o_ascendingSortingImage;

modules/gui/macosx/playlist.m

@@ -153,6 +153,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
 
         if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
         {
+            /* create the menu entries used in the playlist menu */
             o_lmi = [[o_mi_services submenu] addItemWithTitle:
                      [NSString stringWithCString:
                      p_parser->psz_longname ? p_parser->psz_longname :
@@ -166,6 +167,21 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
             if( playlist_IsServicesDiscoveryLoaded( p_playlist,
                     p_parser->psz_object_name ) )
                 [o_lmi setState: NSOnState];
+                
+            /* create the menu entries for the main menu */
+            o_lmi = [[o_mm_mi_services submenu] addItemWithTitle:
+                     [NSString stringWithCString:
+                     p_parser->psz_longname ? p_parser->psz_longname :
+                     ( p_parser->psz_shortname ? p_parser->psz_shortname:
+                     p_parser->psz_object_name)]
+                                             action: @selector(servicesChange:)
+                                             keyEquivalent: @""];
+            [o_lmi setTarget: self];
+            [o_lmi setRepresentedObject:
+                   [NSString stringWithCString: p_parser->psz_object_name]];
+            if( playlist_IsServicesDiscoveryLoaded( p_playlist,
+                    p_parser->psz_object_name ) )
+                [o_lmi setState: NSOnState];
         }
     }
     vlc_list_release( p_list );