Changeset 9b5889a2e846d4a99ebb0b5b1b72f1ea39da8468

Timestamp:

07/05/08 18:30:39 (2 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215275439 +0200

git-parent:

[ffe7bdd1604d611685865f2f67048fabd55f69c7]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1215275439 +0200

Message:

macosx: Kind of fix the preferences on Mac OS X.

Files:

• modules/gui/macosx/prefs.m (modified) (9 diffs)

modules/gui/macosx/prefs.m

@@ -325 +325 @@
-                            withTitle: o_child_title
-                            withHelp: o_child_help
-p_items[i].value.i
+((vlc_object_t*)p_main_module)->i_object_id
-                            parent:self
-                            children:[[NSMutableArray alloc]
-                                initWithCapacity:10]
-i_type
+value.i
-                        break;
-                    case CONFIG_SUBCATEGORY:
@@ -353 +353 @@
-                                withTitle: o_child_title
-                                withHelp: o_child_help
-p_items[i].value.i
+((vlc_object_t*)p_main_module)->i_object_id
-                                parent:p_last_category
-                                children:[[NSMutableArray alloc]
-                                    initWithCapacity:10]
-i_type
+value.i
-                        }
-
@@ -385 +385 @@
-                /* 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;
-                p_items = module_GetConfig( p_module, &confsize );
-
@@ -416 +413 @@
-                long cookie;
-                bool b_found = false;
-
+
-                VLCTreeItem* p_category_item, * p_subcategory_item;
-i = 0 ; i < [o_children count] ; i
+j = 0 ; j < [o_children count] ; j
-                {
-i
-id
+j
+category
-                    {
-                        b_found = true;
@@ -432 +429 @@
-                b_found = false;
-                cookie = -1;
-i = 0 ; i < [p_category_item->o_children count] ; i
+j = 0 ; j < [p_category_item->o_children count] ; j
-                {
-                    p_subcategory_item = [p_category_item->o_children
-i
-id
+j
+category
-                    {
-                        b_found = true;
@@ -592 +589 @@
-            p_items = module_GetConfig( p_main_module, &confsize );
-
+            /* We need to first, find the right (sub)category,
+             * and then abort when we find a new (sub)category. Part of the Ugliness. */
+            bool in_right_category = false;
+            bool in_subcategory = false;
+            bool done = false;
-            for( i = 0; i < confsize; i++ )
-            {
@@ -602 +604 @@
-                switch( p_items[i].i_type )
-                {
+                    case CONFIG_CATEGORY:
+                        if(!in_right_category && p_items[i].value.i == i_object_category)
+                            in_right_category = true;
+                        else if(in_right_category)
+                            done = true;
+                        break;
-                    case CONFIG_SUBCATEGORY:
-
+
+
+
+
+
+
+
+
-                    case CONFIG_SECTION:
-                    case CONFIG_HINT_USAGE:
@@ -609 +624 @@
-                    default:
-                    {
+                        if(!in_right_category) break;
+
-                        VLCConfigControl *o_control = nil;
-                        o_control = [VLCConfigControl newControl:&p_items[i]
@@ -621 +638 @@
-                    }
-                }
+                if( done ) break;
-            }
-            vlc_object_release( (vlc_object_t*)p_main_module );