macosx: added a non-implemented skeletion (just the UI) for a VLM configuration panel...

[vlc] / modules / gui / macosx / prefs_widgets.m

diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 08f994a41d036c77341c853a33415cd3257ef526..c2346698f14a1041be717d345c1facbc01466dee 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -1254,9 +1254,8 @@
 
     if( [super initWithFrame: mainFrame item: _p_item] != nil )
     {
-        int i_index;
-        vlc_list_t *p_list;
-        module_t *p_parser;
+        size_t i_index;
+        module_t *p_parser, **p_list;
         i_view_type = CONFIG_ITEM_MODULE;
 
         o_popupTooltip = [[VLCMain sharedInstance] wrapString:
@@ -1282,21 +1281,21 @@
         [o_popup selectItem: [o_popup lastItem]];
 
         /* build a list of available modules */
-        p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-        for( i_index = 0; i_index < p_list->i_count; i_index++ )
+        p_list = module_list_get( NULL );
+        for( i_index = 0; p_list[i_index]; i_index++ )
         {
-            p_parser = (module_t *)p_list->p_values[i_index].p_object;
+            p_parser = p_list[i_index];
 
             if( p_item->i_type == CONFIG_ITEM_MODULE )
             {
-                if( module_IsCapable( p_parser, p_item->psz_type ) )
+                if( module_provides( p_parser, p_item->psz_type ) )
                 {
                     NSString *o_description = [[VLCMain sharedInstance]
                         localizedString: module_GetLongName( p_parser )];
                     [o_popup addItemWithTitle: o_description];
 
                     if( p_item->value.psz &&
-                !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) )
+                !strcmp( p_item->value.psz, module_get_object( p_parser ) ) )
                         [o_popup selectItem:[o_popup lastItem]];
                 }
             }
@@ -1304,14 +1303,14 @@
             {
                 int i;
 
-                if( !strcmp( module_GetObjName( p_parser ), "main" ) )
+                if( module_is_main( p_parser ) )
                     continue;
                 unsigned int confsize;
                 unsigned int unused;
-                module_GetConfig( p_parser, &confsize );
+                module_config_get( p_parser, &confsize );
                 for ( i = 0; i < confsize; i++ )
                 {
-                    module_config_t *p_config = module_GetConfig( p_parser, &unused ) + i;
+                    module_config_t *p_config = module_config_get( p_parser, &unused ) + i;
                     /* Hack: required subcategory is stored in i_min */
                     if( p_config->i_type == CONFIG_SUBCATEGORY &&
                         p_config->value.i == p_item->min.i )
@@ -1321,13 +1320,13 @@
                         [o_popup addItemWithTitle: o_description];
 
                         if( p_item->value.psz && !strcmp(p_item->value.psz,
-                                                module_GetObjName( p_parser )) )
+                                                module_get_object( p_parser )) )
                             [o_popup selectItem:[o_popup lastItem]];
                     }
                 }
             }
         }
-        vlc_list_release( p_list );
+        module_list_free( p_list );
         [self addSubview: o_popup];
     }
     return self;
@@ -1357,24 +1356,23 @@
 {
     NSString *newval = [o_popup titleOfSelectedItem];
     char *returnval = NULL;
-    int i_module_index;
-    vlc_list_t *p_list;
-    module_t *p_parser;
+    size_t i_module_index;
+    module_t *p_parser, **p_list;
 
-    p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-    for( i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ )
+    p_list = module_list_get( NULL );
+    for( i_module_index = 0; p_list[i_module_index]; i_module_index++ )
     {
-        p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
+        p_parser = p_list[i_module_index];
 
         if( p_item->i_type == CONFIG_ITEM_MODULE )
         {
-            if( module_IsCapable( p_parser, p_item->psz_type ) )
+            if( module_provides( p_parser, p_item->psz_type ) )
             {
                 NSString *o_description = [[VLCMain sharedInstance]
                     localizedString: module_GetLongName( p_parser )];
                 if( [newval isEqualToString: o_description] )
                 {
-                    returnval = strdup( module_GetObjName( p_parser ));
+                    returnval = strdup( module_get_object( p_parser ));
                     break;
                 }
             }
@@ -1383,13 +1381,13 @@
         {
             int i;
 
-            if( !strcmp( module_GetObjName( p_parser ), "main" ) )
+            if( module_is_main( p_parser) )
                 continue;
             unsigned int confsize, unused;
-            module_GetConfig( p_parser, &confsize );
+            module_config_get( p_parser, &confsize );
             for ( i = 0; i < confsize; i++ )
             {
-                module_config_t *p_config = module_GetConfig( p_parser, &unused ) + i;
+                module_config_t *p_config = module_config_get( p_parser, &unused ) + i;
                 /* Hack: required subcategory is stored in i_min */
                 if( p_config->i_type == CONFIG_SUBCATEGORY &&
                     p_config->value.i == p_item->min.i )
@@ -1398,14 +1396,14 @@
                         localizedString: module_GetLongName( p_parser )];
                     if( [newval isEqualToString: o_description] )
                     {
-                        returnval = strdup(module_GetObjName( p_parser ));
+                        returnval = strdup(module_get_object( p_parser ));
                         break;
                     }
                 }
             }
         }
     }
-    vlc_list_release( p_list );
+    module_list_free( p_list );
     return returnval;
 }
 @end
@@ -1441,7 +1439,7 @@
 
         /* build the stepper */
         ADD_STEPPER( o_stepper, mainFrame, mainFrame.size.width - 19,
-            0, o_tooltip, -1600, 1600)
+            0, o_tooltip, -100000, 100000)
         [o_stepper setIntValue: p_item->value.i];
         [o_stepper setAutoresizingMask:NSViewMaxXMargin ];
         [self addSubview: o_stepper];
@@ -1734,7 +1732,7 @@
 
         /* build the stepper */
         ADD_STEPPER( o_stepper, mainFrame, mainFrame.size.width - 19,
-            0, o_tooltip, -1600, 1600)
+            0, o_tooltip, -100000, 100000)
         [o_stepper setFloatValue: p_item->value.f];
         [o_stepper setAutoresizingMask:NSViewMaxXMargin ];
         [self addSubview: o_stepper];
@@ -2043,30 +2041,29 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
         return nil;
 
 //Fill our array to know how may items we have...
-    vlc_list_t *p_list;
-    module_t *p_parser;
-    int i_module_index;
+    module_t *p_parser, **p_list;
+    size_t i_module_index;
     NSRect mainFrame = [o_parent_view frame];
     NSString *o_labelString, *o_textfieldString, *o_tooltip;
 
     o_modulearray = [[NSMutableArray alloc] initWithCapacity:10];
     /* build a list of available modules */
-    p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-    for( i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ )
+    p_list = module_list_get( NULL );
+    for( i_module_index = 0; p_list[i_module_index]; i_module_index++ )
     {
         int i;
-        p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
+        p_parser = p_list[i_module_index];
 
-        if( !strcmp( module_GetObjName( p_parser ), "main" ) )
+        if( module_is_main( p_parser ) )
             continue;
 
         unsigned int confsize;
-        module_GetConfig( p_parser, &confsize );
+        module_config_get( p_parser, &confsize );
 
         for ( i = 0; i < confsize; i++ )
         {
             unsigned int unused;
-            module_config_t *p_config = module_GetConfig( p_parser, &unused ) + i;
+            module_config_t *p_config = module_config_get( p_parser, &unused ) + i;
             NSString *o_modulelongname, *o_modulename;
             NSNumber *o_moduleenabled = nil;
 
@@ -2077,10 +2074,10 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
                 o_modulelongname = [NSString stringWithUTF8String:
                                         module_GetLongName( p_parser )];
                 o_modulename = [NSString stringWithUTF8String:
-                                        module_GetObjName( p_parser )];
+                                        module_get_object( p_parser )];
 
                 if( _p_item->value.psz &&
-                    strstr( _p_item->value.psz, module_GetObjName( p_parser ) ) )
+                    strstr( _p_item->value.psz, module_get_object( p_parser ) ) )
                     o_moduleenabled = [NSNumber numberWithBool:YES];
                 else
                     o_moduleenabled = [NSNumber numberWithBool:NO];
@@ -2091,7 +2088,7 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
             }
         }
     }
-    vlc_list_release( p_list );
+    module_list_free( p_list );
 
     mainFrame.size.height = 30 + 18 * [o_modulearray count];
     mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;