macosx: same as previous commit plus revert of [24799] for prefs.m (unintended commit)

extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib

@@ -473,8 +473,6 @@
                 "o_audio_vol_txt" = id; 
                 "o_intf_art_pop" = id; 
                 "o_intf_art_txt" = id; 
-                "o_intf_black_ckb" = id; 
-                "o_intf_embvout_ckb" = id; 
                 "o_intf_fspanel_ckb" = id; 
                 "o_intf_lang_pop" = id; 
                 "o_intf_lang_txt" = id; 

extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>398 124 505 518 0 0 1280 778 </string>
+	<string>-145 -8 505 518 0 0 1280 778 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>2311</key>
-		<string>310 385 660 305 0 0 1280 778 </string>
+		<string>345 417 590 241 0 0 1280 778 </string>
 		<key>2330</key>
-		<string>190 210 660 502 0 0 1280 778 </string>
+		<string>345 266 590 502 0 0 1280 778 </string>
+		<key>2440</key>
+		<string>179 151 586 376 0 0 1280 778 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
@@ -32,8 +34,9 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2265</integer>
 		<integer>2330</integer>
+		<integer>2265</integer>
+		<integer>2311</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8S2167</string>

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -169,7 +169,7 @@
 			productName = vlc;
 			productReference = 014CEA410018CDE011CA2923 /* VLC.bundle */;
 			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
 <plist version=\"1.0\">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -1523,7 +1523,6 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */;
-			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
 			mainGroup = 089C166AFE841209C02AAC07 /* vlc */;
 			projectDirPath = "";

modules/gui/macosx/prefs.m

@@ -271,37 +271,52 @@ static VLCTreeItem *o_root_item = nil;
     if( [ o_children count] == 0 )
     {
         intf_thread_t   *p_intf = VLCIntf;
-        int             i_index = 0;
+        vlc_list_t      *p_list;
+        module_t        *p_module = NULL;
+        module_t        *p_parser;
         module_config_t *p_item,
                         *p_end;
+        int             i_index = 0;
 
-        /* Build the tree for the main module */
-        const module_t *p_module = NULL;
-        vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
-                                            FIND_ANYWHERE );
-        if( !p_list ) return NULL;
-        for( unsigned i = 0; p_module == NULL; i++ )
-        {
-            assert (i < (unsigned)p_list->i_count);
+        /* List the modules */
+        p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+        if( !p_list ) return nil;
 
-            const module_t *p_main = (module_t *)p_list->p_values[i].p_object;
-            if( strcmp( module_GetObjName( p_main ), "main" ) == 0 )
-                p_module = p_main;
-        }
+        /* get parser */
+        p_parser = (module_t *)p_list->p_values[i_index].p_object;
 
+        if( [[self getName] isEqualToString: @"main"] )
+        {
+            /*
+            * Find the main module
+            */
+            for( i_index = 0; i_index < p_list->i_count; i_index++ )
+            {
+                p_module = (module_t *)p_list->p_values[i_index].p_object;
+                if( !strcmp( module_GetObjName( p_module ), "main" ) )
+                    break;
+            }
+            if( p_module == NULL )
+            {
+                msg_Err( p_intf,
+                    "could not load the preferences" );
+                return nil;
+            }
+            if( i_index < p_list->i_count )
+            {
+                /* We found the main module */
+                /* Enumerate config categories and store a reference so we can
+                 * generate their config panel them when it is asked by the user. */
                 VLCTreeItem *p_last_category = NULL;
                 unsigned int i_confsize;
-        module_config_t *const p_config = module_GetConfig (p_module, &i_confsize);
+                p_item = module_GetConfig( p_parser, &i_confsize );
                 p_end = p_item + i_confsize;
-        
-        for (size_t i = 0; i < i_confsize; i++)
+                o_children = [[NSMutableArray alloc] initWithCapacity:10];
+                if( p_item ) do
                 {
-            p_item = p_config + i;
-            
                     NSString *o_child_name;
                     NSString *o_child_title;
                     NSString *o_child_help;
-
                     switch( p_item->i_type )
                     {
                     case CONFIG_CATEGORY:
@@ -326,7 +341,6 @@ static VLCTreeItem *o_root_item = nil;
                     case CONFIG_SUBCATEGORY:
                         if( p_item->value.i == -1 ) break;
 
-                    /* Special cases: move the main subcategories to the parent cat*/
                         if( p_item->value.i != SUBCAT_PLAYLIST_GENERAL &&
                             p_item->value.i != SUBCAT_VIDEO_GENERAL &&
                             p_item->value.i != SUBCAT_INPUT_GENERAL &&
@@ -350,18 +364,16 @@ static VLCTreeItem *o_root_item = nil;
                                 parent:p_last_category
                                 children:[[NSMutableArray alloc]
                                     initWithCapacity:10]
-                               whithCategory: p_item - module_GetConfig( p_module, &i_confsize )]];
-                        continue;
+                                whithCategory: p_item - module_GetConfig( p_parser, &i_confsize )]];
                         }
-                    break;
  
+                        break;
                     default:
                         break;
                     }
+                } while( p_item < p_end && p_item++ );
             }
-        module_PutConfig (p_config);
 
-        /* Build the tree of plugins */
             /* Build a tree of the plugins */
             /* Add the capabilities */
             for( i_index = 0; i_index < p_list->i_count; i_index++ )
@@ -375,9 +387,9 @@ static VLCTreeItem *o_root_item = nil;
 
                 /* Exclude empty plugins (submodules don't have config */
                 /* options, they are stored in the parent module) */
-            // Does not work
-            //                if( modules_IsSubModule( p_module ) )
-            //                    continue;
+// Does not work
+//                if( modules_IsSubModule( p_module ) )
+//                    continue;
                 p_item = module_GetConfig( p_module, &confsize );
 
                 if( !p_item ) continue;
@@ -442,11 +454,9 @@ static VLCTreeItem *o_root_item = nil;
                     children:IsALeafNode
                     whithCategory: -1]];
                 }
-        
+        }
         vlc_list_release( p_list );
     }
-            
-
     return o_children;
 }