Skip to content

V
vlc-gpu
Commit 526bc3ad authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Attempt to simplify that ugly code.

parent 0ea547ed
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 204 deletions
modules/gui/macosx/prefs.m
View file @ 526bc3ad
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
#import "prefs_widgets.h" #import "prefs_widgets.h"
#import "vlc_keys.h" #import "vlc_keys.h"
/* /!\ Warning: Unreadable code :/ */
/***************************************************************************** /*****************************************************************************
* VLCPrefs implementation * VLCPrefs implementation
*****************************************************************************/ *****************************************************************************/
...@@ -287,116 +289,96 @@ static VLCTreeItem *o_root_item = nil; ...@@ -287,116 +289,96 @@ static VLCTreeItem *o_root_item = nil;
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list; vlc_list_t *p_list;
module_t *p_module = NULL; module_t *p_module = NULL;
module_t *p_parser; module_t *p_main_module;
module_config_t *p_item, module_config_t *p_items;
*p_end; int i = 0;
int i_index = 0;
/* List the modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return nil;
/* get parser */
p_parser = (module_t *)p_list->p_values[i_index].p_object;
if( [[self getName] isEqualToString: @"main"] ) if( [[self getName] isEqualToString: @"main"] )
{ {
/* p_main_module = module_GetMainModule( p_intf );
* Find the main module assert( p_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 */ /* We found the main module */
/* Enumerate config categories and store a reference so we can /* Enumerate config categories and store a reference so we can
* generate their config panel them when it is asked by the user. */ * generate their config panel them when it is asked by the user. */
VLCTreeItem *p_last_category = NULL; VLCTreeItem *p_last_category = NULL;
unsigned int i_confsize; unsigned int i_confsize;
p_item = module_GetConfig( p_parser, &i_confsize ); p_items = module_GetConfig( p_main_module, &i_confsize );
p_end = p_item + i_confsize;
o_children = [[NSMutableArray alloc] initWithCapacity:10]; o_children = [[NSMutableArray alloc] initWithCapacity:10];
if( p_item ) do for( int i = 0; i < i_confsize; i++ )
{ {
NSString *o_child_name; NSString *o_child_name;
NSString *o_child_title; NSString *o_child_title;
NSString *o_child_help; NSString *o_child_help;
switch( p_item->i_type ) switch( p_items[i].i_type )
{ {
case CONFIG_CATEGORY: case CONFIG_CATEGORY:
if( p_item->value.i == -1 ) break; if( p_items[i].value.i == -1 ) break;
o_child_name = [[VLCMain sharedInstance] o_child_name = [[VLCMain sharedInstance]
localizedString: config_CategoryNameGet( p_item->value.i )]; localizedString: config_CategoryNameGet( p_items[i].value.i )];
o_child_title = o_child_name; o_child_title = o_child_name;
o_child_help = [[VLCMain sharedInstance] o_child_help = [[VLCMain sharedInstance]
localizedString: config_CategoryHelpGet( p_item->value.i )]; localizedString: config_CategoryHelpGet( p_items[i].value.i )];
p_last_category = [VLCTreeItem alloc]; p_last_category = [VLCTreeItem alloc];
[o_children addObject:[p_last_category [o_children addObject:[p_last_category
initWithName: o_child_name initWithName: o_child_name
withTitle: o_child_title withTitle: o_child_title
withHelp: o_child_help withHelp: o_child_help
ID: p_item->value.i ID: p_items[i].value.i
parent:self parent:self
children:[[NSMutableArray alloc] children:[[NSMutableArray alloc]
initWithCapacity:10] initWithCapacity:10]
whithCategory: p_item - module_GetConfig( p_module, &i_confsize )]]; whithCategory: p_items[i].i_type]];
break; break;
case CONFIG_SUBCATEGORY: case CONFIG_SUBCATEGORY:
if( p_item->value.i == -1 ) break; if( p_items[i].value.i == -1 ) break;
if( p_item->value.i != SUBCAT_PLAYLIST_GENERAL && if( p_items[i].value.i != SUBCAT_PLAYLIST_GENERAL &&
p_item->value.i != SUBCAT_VIDEO_GENERAL && p_items[i].value.i != SUBCAT_VIDEO_GENERAL &&
p_item->value.i != SUBCAT_INPUT_GENERAL && p_items[i].value.i != SUBCAT_INPUT_GENERAL &&
p_item->value.i != SUBCAT_INTERFACE_GENERAL && p_items[i].value.i != SUBCAT_INTERFACE_GENERAL &&
p_item->value.i != SUBCAT_SOUT_GENERAL && p_items[i].value.i != SUBCAT_SOUT_GENERAL &&
p_item->value.i != SUBCAT_ADVANCED_MISC && p_items[i].value.i != SUBCAT_ADVANCED_MISC &&
p_item->value.i != SUBCAT_AUDIO_GENERAL ) p_items[i].value.i != SUBCAT_AUDIO_GENERAL )
{ {
o_child_name = [[VLCMain sharedInstance] o_child_name = [[VLCMain sharedInstance]
localizedString: config_CategoryNameGet( p_item->value.i ) ]; localizedString: config_CategoryNameGet( p_items[i].value.i ) ];
o_child_title = o_child_name; o_child_title = o_child_name;
o_child_help = [[VLCMain sharedInstance] o_child_help = [[VLCMain sharedInstance]
localizedString: config_CategoryHelpGet( p_item->value.i ) ]; localizedString: config_CategoryHelpGet( p_items[i].value.i ) ];
[p_last_category->o_children [p_last_category->o_children
addObject:[[VLCTreeItem alloc] addObject:[[VLCTreeItem alloc]
initWithName: o_child_name initWithName: o_child_name
withTitle: o_child_title withTitle: o_child_title
withHelp: o_child_help withHelp: o_child_help
ID: p_item->value.i ID: p_items[i].value.i
parent:p_last_category parent:p_last_category
children:[[NSMutableArray alloc] children:[[NSMutableArray alloc]
initWithCapacity:10] initWithCapacity:10]
whithCategory: p_item - module_GetConfig( p_parser, &i_confsize )]]; whithCategory: p_items[i].i_type]];
} }
break; break;
default: default:
break; break;
} }
} while( p_item < p_end && p_item++ ); vlc_object_release( (vlc_object_t *)p_main_module );
} }
/* List the modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return nil;
/* Build a tree of the plugins */ /* Build a tree of the plugins */
/* Add the capabilities */ /* Add the capabilities */
for( i_index = 0; i_index < p_list->i_count; i_index++ ) for( i = 0; i < p_list->i_count; i++ )
{ {
unsigned int confsize; unsigned int confsize;
p_module = (module_t *)p_list->p_values[i_index].p_object; p_module = (module_t *)p_list->p_values[i].p_object;
/* Exclude the main module */ /* Exclude the main module */
if( !strcmp( module_GetObjName( p_module ), "main" ) ) if( module_IsMainModule( p_module ) )
continue; continue;
/* Exclude empty plugins (submodules don't have config */ /* Exclude empty plugins (submodules don't have config */
...@@ -404,26 +386,29 @@ static VLCTreeItem *o_root_item = nil; ...@@ -404,26 +386,29 @@ static VLCTreeItem *o_root_item = nil;
// Does not work // Does not work
// if( modules_IsSubModule( p_module ) ) // if( modules_IsSubModule( p_module ) )
// continue; // continue;
p_item = module_GetConfig( p_module, &confsize ); p_items = module_GetConfig( p_module, &confsize );
unsigned int j;
if( !p_item ) continue;
if( !p_item->i_type ) break;
int i_category = -1; int i_category = -1;
int i_subcategory = -1; int i_subcategory = -1;
int i_options = 0; bool b_item = false;
do
for( j = 0; j < confsize; j++ )
{ {
if( p_item->i_type == CONFIG_CATEGORY ) if( p_items[j].i_type == CONFIG_CATEGORY )
i_category = p_item->value.i; i_category = p_items[j].value.i;
else if( p_item->i_type == CONFIG_SUBCATEGORY ) else if( p_items[j].i_type == CONFIG_SUBCATEGORY )
i_subcategory = p_item->value.i; i_subcategory = p_items[j].value.i;
if( p_item->i_type & CONFIG_ITEM ) if( p_items[j].i_type & CONFIG_ITEM )
i_options ++; b_item = true;
if( i_options > 0 && i_category >= 0 && i_subcategory >= 0 )
if( b_item && i_category >= 0 && i_subcategory >= 0 )
break; break;
} while( p_item < p_end && p_item++ ); }
if( !i_options ) continue;
if( !b_item ) continue;
/* Find the right category item */ /* Find the right category item */
...@@ -556,49 +541,35 @@ static VLCTreeItem *o_root_item = nil; ...@@ -556,49 +541,35 @@ static VLCTreeItem *o_root_item = nil;
{ {
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list; vlc_list_t *p_list;
module_t *p_parser = NULL; module_t *p_module = NULL;
module_config_t *p_item, module_t *p_main_module;
*p_end; module_config_t *p_items;
unsigned int confsize; unsigned int confsize;
o_subviews = [[NSMutableArray alloc] initWithCapacity:10]; o_subviews = [[NSMutableArray alloc] initWithCapacity:10];
/* Get a pointer to the module */ /* Get a pointer to the module */
if( i_object_category == -1 ) if( i_object_category == -1 )
{ {
p_parser = (module_t *) vlc_object_get( i_object_id ); p_module = (module_t *) vlc_object_get( i_object_id );
if( !p_parser ) assert( p_module );
{
/* 0OOoo something went really bad */
return nil;
}
p_item = module_GetConfig( p_parser, &confsize );
p_end = p_item + confsize;
do p_items = module_GetConfig( p_module, &confsize );
{
if( !p_item ) for( unsigned int i = 0; i < confsize; i++ )
{ {
msg_Err( p_intf, "invalid preference item found" ); switch( p_items[i].i_type )
break;
}
if( p_item > p_end )
break;
switch(p_item->i_type)
{ {
case CONFIG_SUBCATEGORY: case CONFIG_SUBCATEGORY:
break;
case CONFIG_CATEGORY: case CONFIG_CATEGORY:
break;
case CONFIG_SECTION: case CONFIG_SECTION:
break;
case CONFIG_HINT_USAGE: case CONFIG_HINT_USAGE:
break; break;
default: default:
{ {
VLCConfigControl *o_control = nil; VLCConfigControl *o_control = nil;
o_control = [VLCConfigControl newControl:p_item o_control = [VLCConfigControl newControl:&p_items[i]
withView:o_view]; withView:o_view];
if( o_control != nil ) if( o_control )
{ {
[o_control setAutoresizingMask: NSViewMaxYMargin | [o_control setAutoresizingMask: NSViewMaxYMargin |
NSViewWidthSizable]; NSViewWidthSizable];
...@@ -607,68 +578,37 @@ static VLCTreeItem *o_root_item = nil; ...@@ -607,68 +578,37 @@ static VLCTreeItem *o_root_item = nil;
} }
break; break;
} }
} while( p_item < p_end && p_item++ );
vlc_object_release( (vlc_object_t*)p_parser );
} }
else vlc_object_release( (vlc_object_t*)p_module );
{
int i_index;
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return o_view;
/*
* Find the main module
*/
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
p_parser = (module_t *)p_list->p_values[i_index].p_object;
if( !strcmp( module_GetObjName( p_parser ), "main" ) )
break;
} }
if( p_parser == NULL ) else
{ {
msg_Err( p_intf, "could not load preferences" ); p_main_module = module_GetMainModule( p_intf );
return o_view; assert( !p_main_module );
} module_config_t *p_items;
unsigned int confsize;
p_item = module_GetConfig( p_parser, &confsize );
p_end = p_item + confsize;
p_item += i_object_category;
if( ( p_item->i_type == CONFIG_CATEGORY ) && unsigned int i, confsize;
( ( p_item->value.i == CAT_PLAYLIST ) || p_items = module_GetConfig( p_main_module, &confsize );
( p_item->value.i == CAT_AUDIO ) ||
( p_item->value.i == CAT_VIDEO ) ||
( p_item->value.i == CAT_INTERFACE ) ||
( p_item->value.i == CAT_INPUT ) ||
( p_item->value.i == CAT_SOUT ) ) )
p_item++;
do for( i = 0; i < confsize; i++ )
{ {
p_item++; if( !p_items[i].i_type )
if( !p_item || !p_item->i_type )
{ {
msg_Err( p_intf, "invalid preference item found" ); msg_Err( p_intf, "invalid preference item found" );
break; break;
} }
if( p_item > p_end )
break; switch( p_items[i].i_type )
switch( p_item->i_type )
{ {
case CONFIG_SUBCATEGORY: case CONFIG_SUBCATEGORY:
break;
case CONFIG_CATEGORY: case CONFIG_CATEGORY:
break;
case CONFIG_SECTION: case CONFIG_SECTION:
break;
case CONFIG_HINT_USAGE: case CONFIG_HINT_USAGE:
break; break;
default: default:
{ {
VLCConfigControl *o_control = nil; VLCConfigControl *o_control = nil;
o_control = [VLCConfigControl newControl:p_item o_control = [VLCConfigControl newControl:&p_items[i]
withView:o_view]; withView:o_view];
if( o_control != nil ) if( o_control != nil )
{ {
...@@ -679,10 +619,8 @@ static VLCTreeItem *o_root_item = nil; ...@@ -679,10 +619,8 @@ static VLCTreeItem *o_root_item = nil;
break; break;
} }
} }
} while ( ( p_item < p_end ) && }
( p_item->i_type != CONFIG_SUBCATEGORY ) ); vlc_object_release( (vlc_object_t*)p_main_module );
vlc_list_release( p_list );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment