Remove code killed by previous commit

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

diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 62c2ab1e5fea74ce13567b1e21885272f8a992fb..d23d3705c6b0f3f9637ce86654cc31019533e7d7 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -409,16 +409,6 @@
     [self setFrame:frame];
 }
 
-#if GC_ENABLED
-- (void)finalize
-{
-    /* since dealloc isn't called on 10.5 if GC is enabled and since GC is
-     * Obj-C only, we need to do this: */
-    if( psz_name ) free( psz_name );
-    [super finalize];
-}
-#endif
-
 - (void)dealloc
 {
     if( o_label ) [o_label release];
@@ -822,11 +812,6 @@
                       withView: (NSView *)o_parent_view
 {
     VLCConfigControl *p_control = NULL;
-    /* Skip depracated options */
-    if( _p_item->psz_current )
-    {
-        return NULL;
-    }
 
     switch( _p_item->i_type )
     {
@@ -1297,15 +1282,14 @@
 
             if( p_item->i_type == CONFIG_ITEM_MODULE )
             {
-                if( !strcmp( p_parser->psz_capability,
-                            p_item->psz_type ) )
+                if( module_IsCapable( p_parser, p_item->psz_type ) )
                 {
                     NSString *o_description = [[VLCMain sharedInstance]
-                        localizedString: (char *)p_parser->psz_longname];
+                        localizedString: module_GetLongName( p_parser )];
                     [o_popup addItemWithTitle: o_description];
 
                     if( p_item->value.psz &&
-                !strcmp( p_item->value.psz, p_parser->psz_object_name ) )
+                !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) )
                         [o_popup selectItem:[o_popup lastItem]];
                 }
             }
@@ -1313,22 +1297,24 @@
             {
                 int i;
 
-                if( !strcmp( p_parser->psz_object_name, "main" ) )
+                if( !strcmp( module_GetObjName( p_parser ), "main" ) )
                     continue;
-
-                for ( i = 0; i < p_parser->confsize; i++ )
+                unsigned int confsize;
+                unsigned int unused;
+                module_GetConfig( p_parser, &confsize );
+                for ( i = 0; i < confsize; i++ )
                 {
-                    module_config_t *p_config = p_parser->p_config + i;
+                    module_config_t *p_config = module_GetConfig( 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 )
                     {
                         NSString *o_description = [[VLCMain sharedInstance]
-                            localizedString: (char *)p_parser->psz_longname];
+                            localizedString: module_GetLongName( p_parser )];
                         [o_popup addItemWithTitle: o_description];
 
                         if( p_item->value.psz && !strcmp(p_item->value.psz,
-                                                p_parser->psz_object_name) )
+                                                module_GetObjName( p_parser )) )
                             [o_popup selectItem:[o_popup lastItem]];
                     }
                 }
@@ -1375,14 +1361,13 @@
 
         if( p_item->i_type == CONFIG_ITEM_MODULE )
         {
-            if( !strcmp( p_parser->psz_capability,
-                    p_item->psz_type ) )
+            if( module_IsCapable( p_parser, p_item->psz_type ) )
             {
                 NSString *o_description = [[VLCMain sharedInstance]
-                    localizedString: (char *)p_parser->psz_longname];
+                    localizedString: module_GetLongName( p_parser )];
                 if( [newval isEqualToString: o_description] )
                 {
-                    returnval = strdup(p_parser->psz_object_name);
+                    returnval = strdup( module_GetObjName( p_parser ));
                     break;
                 }
             }
@@ -1391,21 +1376,22 @@
         {
             int i;
 
-            if( !strcmp( p_parser->psz_object_name, "main" ) )
+            if( !strcmp( module_GetObjName( p_parser ), "main" ) )
                 continue;
-
-            for ( i = 0; i < p_parser->confsize; i++ )
+            unsigned int confsize, unused;
+            module_GetConfig( p_parser, &confsize );
+            for ( i = 0; i < confsize; i++ )
             {
-                module_config_t *p_config = p_parser->p_config + i;
+                module_config_t *p_config = module_GetConfig( 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 )
                 {
                     NSString *o_description = [[VLCMain sharedInstance]
-                        localizedString: (char *)p_parser->psz_longname];
+                        localizedString: module_GetLongName( p_parser )];
                     if( [newval isEqualToString: o_description] )
                     {
-                        returnval = strdup(p_parser->psz_object_name);
+                        returnval = strdup(module_GetObjName( p_parser ));
                         break;
                     }
                 }
@@ -2060,12 +2046,16 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
         int i;
         p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
 
-        if( !strcmp( p_parser->psz_object_name, "main" ) )
+        if( !strcmp( module_GetObjName( p_parser ), "main" ) )
             continue;
 
-        for ( i = 0; i < p_parser->confsize; i++ )
+        unsigned int confsize;
+        module_GetConfig( p_parser, &confsize );
+
+        for ( i = 0; i < confsize; i++ )
         {
-            module_config_t *p_config = p_parser->p_config + i;
+            unsigned int unused;
+            module_config_t *p_config = module_GetConfig( p_parser, &unused ) + i;
             NSString *o_modulelongname, *o_modulename;
             NSNumber *o_moduleenabled = nil;
 
@@ -2074,12 +2064,12 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
                 p_config->value.i == _p_item->min.i )
             {
                 o_modulelongname = [NSString stringWithUTF8String:
-                                        p_parser->psz_longname];
+                                        module_GetLongName( p_parser )];
                 o_modulename = [NSString stringWithUTF8String:
-                                        p_parser->psz_object_name];
+                                        module_GetObjName( p_parser )];
 
                 if( _p_item->value.psz &&
-                    strstr( _p_item->value.psz, p_parser->psz_object_name ) )
+                    strstr( _p_item->value.psz, module_GetObjName( p_parser ) ) )
                     o_moduleenabled = [NSNumber numberWithBool:YES];
                 else
                     o_moduleenabled = [NSNumber numberWithBool:NO];