Skip to content

V
vlc-gpu
Commit 35736da0 authored by Jérome Decoodt's avatar Jérome Decoodt
Browse files
Options

*: remove useless code

parent 060244a8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 233 deletions
modules/gui/macosx/prefs.m
View file @ 35736da0
...@@ -491,8 +491,6 @@ fprintf( stderr, "[%s] showView\n", [o_name UTF8String] ); ...@@ -491,8 +491,6 @@ fprintf( stderr, "[%s] showView\n", [o_name UTF8String] );
} }
p_item = p_parser->p_config; p_item = p_parser->p_config;
int i = 0; int i = 0;
int i_yPos = -2;
int i_lastItem = 0;
p_item = p_parser->p_config + 1; p_item = p_parser->p_config + 1;
...@@ -521,83 +519,20 @@ fprintf( stderr, "end of (sub)category\n" ); ...@@ -521,83 +519,20 @@ fprintf( stderr, "end of (sub)category\n" );
fprintf( stderr, "skipping hint usage\n" ); fprintf( stderr, "skipping hint usage\n" );
break; break;
default: default:
fprintf( stderr, "%s (%d) is ", p_item->psz_name, p_item->i_type ); fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type );
{ {
VLCConfigControl *o_control = nil; VLCConfigControl *o_control = nil;
int i_widget = 0;
switch( p_item->i_type )
{
case CONFIG_ITEM_STRING:
fprintf( stderr, "CONFIG_ITEM_STRING" );
if( !p_item->i_list )
i_widget = CONFIG_ITEM_STRING;
else
i_widget = CONFIG_ITEM_STRING_LIST;
break;
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
fprintf( stderr, "CONFIG_ITEM_FILE" );
i_widget = CONFIG_ITEM_FILE;
break;
case CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE_CAT:
fprintf( stderr, "CONFIG_ITEM_MODULE" );
i_widget = CONFIG_ITEM_MODULE;
break;
case CONFIG_ITEM_INTEGER:
fprintf( stderr, "CONFIG_ITEM_INTEGER" );
if( p_item->i_list )
i_widget = CONFIG_ITEM_STRING_LIST;
else if( p_item->i_min != 0 || p_item->i_max != 0 )
i_widget = CONFIG_ITEM_RANGED_INTEGER;
else
i_widget = CONFIG_ITEM_INTEGER;
break;
case CONFIG_ITEM_FLOAT:
fprintf( stderr, "CONFIG_ITEM_FLOAT" );
if( p_item->f_min != 0 || p_item->f_max != 0 )
i_widget = CONFIG_ITEM_RANGED_INTEGER;
else
i_widget = CONFIG_ITEM_INTEGER;
break;
case CONFIG_ITEM_BOOL:
fprintf( stderr, "CONFIG_ITEM_BOOL" );
i_widget = CONFIG_ITEM_BOOL;
break;
case CONFIG_ITEM_KEY:
fprintf( stderr, "CONFIG_ITEM_KEY" );
if( MACOS_VERSION < 10.3 )
i_widget = CONFIG_ITEM_KEY_BEFORE_10_3;
else
i_widget = CONFIG_ITEM_KEY_AFTER_10_3;
break;
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
fprintf( stderr, "CONFIG_ITEM_MODULE_LIST" );
i_widget = CONFIG_ITEM_MODULE_LIST;
break;
default:
fprintf( stderr, "***UNKNOWN***" );
}
if( i_widget != 0 )
{
i_yPos += [VLCConfigControl
calcVerticalMargin:i_widget lastItem:i_lastItem];
o_control = [VLCConfigControl newControl:p_item o_control = [VLCConfigControl newControl:p_item
withView:o_view withView:o_view];
yOffset: i_yPos];
if( o_control != nil ) if( o_control != nil )
{ {
i_yPos += [o_control frame].size.height;
i_lastItem = i_widget;
[o_control setAutoresizingMask: NSViewMaxYMargin | [o_control setAutoresizingMask: NSViewMaxYMargin |
NSViewWidthSizable]; NSViewWidthSizable];
[o_subviews addObject: o_control]; [o_subviews addObject: o_control];
} }
}
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
break;
} }
break;
} }
} while( p_item++->i_type != CONFIG_HINT_END ); } while( p_item++->i_type != CONFIG_HINT_END );
...@@ -606,8 +541,6 @@ fprintf( stderr, "\n" ); ...@@ -606,8 +541,6 @@ fprintf( stderr, "\n" );
else else
{ {
int i = 0; int i = 0;
int i_yPos = -2;
int i_lastItem = 0;
int i_index; int i_index;
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return o_view; if( !p_list ) return o_view;
...@@ -659,81 +592,17 @@ fprintf( stderr, "end of (sub)category\n" ); ...@@ -659,81 +592,17 @@ fprintf( stderr, "end of (sub)category\n" );
fprintf( stderr, "skipping hint usage\n" ); fprintf( stderr, "skipping hint usage\n" );
break; break;
default: default:
fprintf( stderr, "%s (%d) is ", p_item->psz_name, p_item->i_type ); fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type );
{ {
VLCConfigControl *o_control = nil; VLCConfigControl *o_control = nil;
int i_widget = 0;
switch( p_item->i_type )
{
case CONFIG_ITEM_STRING:
fprintf( stderr, "CONFIG_ITEM_STRING" );
if( !p_item->i_list )
i_widget = CONFIG_ITEM_STRING;
else
i_widget = CONFIG_ITEM_STRING_LIST;
break;
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
fprintf( stderr, "CONFIG_ITEM_FILE" );
i_widget = CONFIG_ITEM_FILE;
break;
case CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE_CAT:
fprintf( stderr, "CONFIG_ITEM_MODULE" );
i_widget = CONFIG_ITEM_MODULE;
break;
case CONFIG_ITEM_INTEGER:
fprintf( stderr, "CONFIG_ITEM_INTEGER" );
if( p_item->i_list )
i_widget = CONFIG_ITEM_STRING_LIST;
else if( p_item->i_min != 0 || p_item->i_max != 0 )
i_widget = CONFIG_ITEM_RANGED_INTEGER;
else
i_widget = CONFIG_ITEM_INTEGER;
break;
case CONFIG_ITEM_FLOAT:
fprintf( stderr, "CONFIG_ITEM_FLOAT" );
if( p_item->f_min != 0 || p_item->f_max != 0 )
i_widget = CONFIG_ITEM_RANGED_INTEGER;
else
i_widget = CONFIG_ITEM_INTEGER;
break;
case CONFIG_ITEM_BOOL:
fprintf( stderr, "CONFIG_ITEM_BOOL" );
i_widget = CONFIG_ITEM_BOOL;
break;
case CONFIG_ITEM_KEY:
fprintf( stderr, "CONFIG_ITEM_KEY" );
if( MACOS_VERSION < 10.3 )
i_widget = CONFIG_ITEM_KEY_BEFORE_10_3;
else
i_widget = CONFIG_ITEM_KEY_AFTER_10_3;
break;
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
fprintf( stderr, "CONFIG_ITEM_MODULE_LIST" );
i_widget = CONFIG_ITEM_MODULE_LIST;
break;
default:
fprintf( stderr, "***UNKNOWN***" );
}
if( i_widget != 0 )
{
i_yPos += [VLCConfigControl
calcVerticalMargin:i_widget lastItem:i_lastItem];
o_control = [VLCConfigControl newControl:p_item o_control = [VLCConfigControl newControl:p_item
withView:o_view withView:o_view];
yOffset: i_yPos];
if( o_control != nil ) if( o_control != nil )
{ {
i_yPos += [o_control frame].size.height;
i_lastItem = i_widget;
[o_control setAutoresizingMask: NSViewMaxYMargin | [o_control setAutoresizingMask: NSViewMaxYMargin |
NSViewWidthSizable]; NSViewWidthSizable];
[o_subviews addObject: o_control]; [o_subviews addObject: o_control];
} }
}
fprintf( stderr, "\n" );
break; break;
} }
} }
...@@ -748,7 +617,7 @@ fprintf( stderr, "\n" ); ...@@ -748,7 +617,7 @@ fprintf( stderr, "\n" );
if( o_view != nil ) if( o_view != nil )
{ {
int i_lastItem = 0; int i_lastItem = 0;
int i_yPos = 0; int i_yPos = -2;
unsigned int i; unsigned int i;
for( i = 0 ; i < [o_subviews count] ; i++ ) for( i = 0 ; i < [o_subviews count] ; i++ )
{ {
...@@ -763,8 +632,6 @@ fprintf( stderr, "\n" ); ...@@ -763,8 +632,6 @@ fprintf( stderr, "\n" );
[o_widget setYPos:i_yPos]; [o_widget setYPos:i_yPos];
i_yPos += [o_widget frame].size.height; i_yPos += [o_widget frame].size.height;
i_lastItem = i_widget; i_lastItem = i_widget;
[o_widget setAutoresizingMask: NSViewMaxYMargin |
NSViewWidthSizable];
[o_view addSubview:o_widget]; [o_view addSubview:o_widget];
} }
...@@ -777,12 +644,10 @@ fprintf( stderr, "\n" ); ...@@ -777,12 +644,10 @@ fprintf( stderr, "\n" );
{ {
unsigned int i; unsigned int i;
if( o_subviews != nil ) if( o_subviews != nil )
{
//Item has been shown //Item has been shown
fprintf( stderr, "[%s] applying changes\n", [o_name cString]);
for( i = 0 ; i < [o_subviews count] ; i++ ) for( i = 0 ; i < [o_subviews count] ; i++ )
[[o_subviews objectAtIndex:i] applyChanges]; [[o_subviews objectAtIndex:i] applyChanges];
}
if( o_children != IsALeafNode ) if( o_children != IsALeafNode )
for( i = 0 ; i < [o_children count] ; i++ ) for( i = 0 ; i < [o_children count] ; i++ )
[[o_children objectAtIndex:i] applyChanges]; [[o_children objectAtIndex:i] applyChanges];
......
modules/gui/macosx/prefs_widgets.h
View file @ 35736da0
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
} }
+ (VLCConfigControl *)newControl: (module_config_t *)_p_item + (VLCConfigControl *)newControl: (module_config_t *)_p_item
withView: (NSView *)o_parent_view yOffset:(int) i_yPos; withView: (NSView *)o_parent_view;
- (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item; - (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item;
- (NSString *)getName; - (NSString *)getName;
- (int)getType; - (int)getType;
...@@ -63,8 +63,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -63,8 +63,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -74,8 +73,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -74,8 +73,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -87,8 +85,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -87,8 +85,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
- (IBAction)openFileDialog: (id)sender; - (IBAction)openFileDialog: (id)sender;
- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info; - (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info;
...@@ -101,8 +98,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -101,8 +98,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -114,8 +110,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -114,8 +110,7 @@ static NSMenu *o_keys_menu = nil;
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
- (IBAction)stepperChanged:(id)sender; - (IBAction)stepperChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification; - (void)textfieldChanged:(NSNotification *)o_notification;
...@@ -127,8 +122,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -127,8 +122,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -142,8 +136,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -142,8 +136,7 @@ static NSMenu *o_keys_menu = nil;
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
- (IBAction)sliderChanged:(id)sender; - (IBAction)sliderChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification; - (void)textfieldChanged:(NSNotification *)o_notification;
...@@ -155,8 +148,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -155,8 +148,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -168,8 +160,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -168,8 +160,7 @@ static NSMenu *o_keys_menu = nil;
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
- (IBAction)stepperChanged:(id)sender; - (IBAction)stepperChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification; - (void)textfieldChanged:(NSNotification *)o_notification;
...@@ -185,8 +176,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -185,8 +176,7 @@ static NSMenu *o_keys_menu = nil;
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
- (IBAction)sliderChanged:(id)sender; - (IBAction)sliderChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification; - (void)textfieldChanged:(NSNotification *)o_notification;
...@@ -202,8 +192,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -202,8 +192,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -213,8 +202,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -213,8 +202,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
...@@ -226,8 +214,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -226,8 +214,7 @@ static NSMenu *o_keys_menu = nil;
} }
- (id) initWithItem: (module_config_t *)_p_item - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view withView: (NSView *)o_parent_view;
withVerticalOffset: (int)i_yPos;
@end @end
......
modules/gui/macosx/prefs_widgets.m
View file @ 35736da0
This diff is collapsed.
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