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

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 2513faeab3867f941fb2eb0b9440ecf9f250841d..4704eb5cfb7759965ff7cd8331396d57cf09e158 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/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; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 8f99c874d6ecdd02f5b80f9755290d262610c871..01db4392db7f3a60a704b85a46ac57717e6281f4 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/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>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 7b7a090abf06a8ba9acffa2d3c709aa6ab7078f6..88b4dc3ea7c6cbc8450498774730609f28e7ec2a 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 6fee48cf360158920f02382606e9f382a80d63d2..995265bb00826e4dd70a6af3f816baa026e626ea 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/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;

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 520029a49154b71375a0766793f95f7b9110781c..68ec731060df052f21b403f94c0c4c4d594f39b1 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/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 );