X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fprefs_widgets.m;h=afa4c53b7eb30cfad6d2c5f12efdcd8b8c25d47a;hb=9ecd18578e50dd748818dffca1b03bf90af85fd7;hp=514a82d34189620798d2fe2e843ac742d4648559;hpb=b252ac5ce38e455f4c505fa735a87fc81853295b;p=vlc diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m index 514a82d341..afa4c53b7e 100644 --- a/modules/gui/macosx/prefs_widgets.m +++ b/modules/gui/macosx/prefs_widgets.m @@ -1,17 +1,17 @@ /***************************************************************************** * prefs_widgets.m: Preferences controls ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Derk-Jan Hartman - * Jérôme Decoodt + * Jérôme Decoodt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -28,7 +28,11 @@ #include /* malloc(), free() */ #include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "vlc_keys.h" #include "intf.h" @@ -38,7 +42,7 @@ #define OFFSET_RIGHT 20 #define OFFSET_BETWEEN 2 -#define UPWARDS_WHITE_ARROW "\xE2\x87\xA7" +#define UPWARDS_WHITE_ARROW "\xE2\x87\xA7" #define OPTION_KEY "\xE2\x8C\xA5" #define UP_ARROWHEAD "\xE2\x8C\x83" #define PLACE_OF_INTEREST_SIGN "\xE2\x8C\x98" @@ -51,13 +55,10 @@ action:nil keyEquivalent:@""]; \ [o_mi setKeyEquivalentModifierMask: \ 0]; \ -if( MACOS_VERSION >= 10.3 ) \ [o_mi setAlternate: NO]; \ [o_mi setTag: \ ( value )]; \ [o_menu addItem: o_mi]; \ -if( MACOS_VERSION >= 10.3 ) \ -{ \ /* Ctrl */ \ o_mi = [[NSMenuItem alloc] initWithTitle: \ [[NSString stringWithUTF8String: \ @@ -245,7 +246,6 @@ if( MACOS_VERSION >= 10.3 ) \ [o_mi setTag: \ KEY_MODIFIER_COMMAND | ( value )]; \ [o_menu addItem: o_mi]; \ -} \ } #define ADD_LABEL( o_label, superFrame, x_offset, my_y_offset, label ) \ @@ -396,7 +396,7 @@ if( MACOS_VERSION >= 10.3 ) \ if( self != nil ) { p_item = _p_item; - psz_name = strdup( p_item->psz_name ); + psz_name = p_item->psz_name; o_label = NULL; i_type = p_item->i_type; i_view_type = 0; @@ -416,7 +416,7 @@ if( MACOS_VERSION >= 10.3 ) \ - (void)dealloc { if( o_label ) [o_label release]; - if( psz_name ) free( psz_name ); + free( psz_name ); [super dealloc]; } @@ -816,11 +816,6 @@ if( MACOS_VERSION >= 10.3 ) \ withView: (NSView *)o_parent_view { VLCConfigControl *p_control = NULL; - /* Skip depracated options */ - if( _p_item->psz_current ) - { - return NULL; - } switch( _p_item->i_type ) { @@ -857,7 +852,7 @@ if( MACOS_VERSION >= 10.3 ) \ initWithItem: _p_item withView: o_parent_view]; } - else if( _p_item->i_min != 0 || _p_item->i_max != 0 ) + else if( _p_item->min.i != 0 || _p_item->max.i != 0 ) { p_control = [[RangedIntegerConfigControl alloc] initWithItem: _p_item @@ -876,7 +871,7 @@ if( MACOS_VERSION >= 10.3 ) \ withView: o_parent_view]; break; case CONFIG_ITEM_FLOAT: - if( _p_item->f_min != 0 || _p_item->f_max != 0 ) + if( _p_item->min.f != 0 || _p_item->max.f != 0 ) { p_control = [[RangedFloatConfigControl alloc] initWithItem: _p_item @@ -890,18 +885,9 @@ if( MACOS_VERSION >= 10.3 ) \ } break; case CONFIG_ITEM_KEY: - if( MACOS_VERSION < 10.3 ) - { - p_control = [[KeyConfigControlBefore103 alloc] + p_control = [[KeyConfigControl alloc] initWithItem: _p_item withView: o_parent_view]; - } - else - { - p_control = [[KeyConfigControlAfter103 alloc] - initWithItem: _p_item - withView: o_parent_view]; - } break; case CONFIG_ITEM_MODULE_LIST: case CONFIG_ITEM_MODULE_LIST_CAT: @@ -966,7 +952,7 @@ if( MACOS_VERSION >= 10.3 ) \ case CONFIG_ITEM_KEY: /* So you don't need to restart to have the changes take effect */ val.i_int = [self intValue]; - var_Set( VLCIntf->p_vlc, psz_name, val ); + var_Set( VLCIntf->p_libvlc, psz_name, val ); case CONFIG_ITEM_INTEGER: case CONFIG_ITEM_BOOL: config_PutInt( VLCIntf, psz_name, [self intValue] ); @@ -981,6 +967,12 @@ if( MACOS_VERSION >= 10.3 ) \ { return [o_label frame].size.width; } + +- (void) alignWithXPosition:(int)i_xPos; +{ + /* FIXME: not implemented atm, but created to shut up the warning + * about "method definition not found" -- FK @ 7/24/05 */ +} @end @implementation StringConfigControl @@ -1000,7 +992,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -1009,11 +1001,11 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the textfield */ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString: - [[VLCMain sharedInstance] localizedString: p_item->psz_longtext] + [[VLCMain sharedInstance] localizedString: (char *)p_item->psz_longtext] toWidth: PREFS_WRAP]; - if( p_item->psz_value ) + if( p_item->value.psz ) o_textfieldString = [[VLCMain sharedInstance] - localizedString: p_item->psz_value]; + localizedString: (char *)p_item->value.psz]; else o_textfieldString = [NSString stringWithString: @""]; ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2, @@ -1070,7 +1062,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -1080,13 +1072,13 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the textfield */ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_COMBO( o_combo, mainFrame, [o_label frame].size.width, -2, 0, o_textfieldTooltip ) [o_combo setAutoresizingMask:NSViewWidthSizable ]; for( i_index = 0; i_index < p_item->i_list; i_index++ ) - if( p_item->psz_value && - !strcmp( p_item->psz_value, p_item->ppsz_list[i_index] ) ) + if( p_item->value.psz && + !strcmp( p_item->value.psz, p_item->ppsz_list[i_index] ) ) [o_combo selectItemAtIndex: i_index]; [self addSubview: o_combo]; } @@ -1134,9 +1126,9 @@ if( MACOS_VERSION >= 10.3 ) \ if( p_item->ppsz_list_text && p_item->ppsz_list_text[i_index] ) { return [[VLCMain sharedInstance] - localizedString: p_item->ppsz_list_text[i_index]]; + localizedString: (char *)p_item->ppsz_list_text[i_index]]; } else return [[VLCMain sharedInstance] - localizedString: p_item->ppsz_list[i_index]]; + localizedString: (char *)p_item->ppsz_list[i_index]]; } @end @@ -1162,7 +1154,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, 3, o_labelString ) @@ -1172,7 +1164,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the button */ o_buttonTooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_RIGHT_BUTTON( o_button, mainFrame, 0, 0, o_buttonTooltip, _NS("Browse...") ) [o_button setAutoresizingMask:NSViewMinXMargin ]; @@ -1181,10 +1173,9 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the textfield */ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; - if( p_item->psz_value ) - o_textfieldString = [[VLCMain sharedInstance] - localizedString: p_item->psz_value]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; + if( p_item->value.psz ) + o_textfieldString = [NSString stringWithFormat: @"%s", (char *)p_item->value.psz]; else o_textfieldString = [NSString stringWithString: @""]; ADD_TEXTFIELD( o_textfield, mainFrame, 12, 2, mainFrame.size.width - @@ -1223,7 +1214,7 @@ if( MACOS_VERSION >= 10.3 ) \ types:nil modalForWindow:[sender window] modalDelegate: self - didEndSelector: @selector(pathChosenInPanel: + didEndSelector: @selector(pathChosenInPanel: withReturn: contextInfo:) contextInfo: nil]; @@ -1269,7 +1260,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString ) @@ -1279,7 +1270,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the popup */ o_popupTooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_POPUP( o_popup, mainFrame, [o_label frame].size.width, -2, 0, o_popupTooltip ) [o_popup setAutoresizingMask:NSViewWidthSizable ]; @@ -1291,43 +1282,46 @@ if( MACOS_VERSION >= 10.3 ) \ p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); for( i_index = 0; i_index < p_list->i_count; i_index++ ) { - p_parser = (module_t *)p_list->p_values[i_index].p_object ; + p_parser = (module_t *)p_list->p_values[i_index].p_object; + 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: p_parser->psz_longname]; + localizedString: module_GetLongName( p_parser )]; [o_popup addItemWithTitle: o_description]; - if( p_item->psz_value && - !strcmp( p_item->psz_value, p_parser->psz_object_name ) ) + if( p_item->value.psz && + !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) ) [o_popup selectItem:[o_popup lastItem]]; } } else { - module_config_t *p_config; - if( !strcmp( p_parser->psz_object_name, "main" ) ) - continue; - - p_config = p_parser->p_config; - if( p_config ) do + int i; + + if( !strcmp( module_GetObjName( p_parser ), "main" ) ) + continue; + unsigned int confsize; + unsigned int unused; + module_GetConfig( p_parser, &confsize ); + for ( i = 0; i < confsize; 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->i_value == p_item->i_min ) + p_config->value.i == p_item->min.i ) { NSString *o_description = [[VLCMain sharedInstance] - localizedString: p_parser->psz_longname]; + localizedString: module_GetLongName( p_parser )]; [o_popup addItemWithTitle: o_description]; - if( p_item->psz_value && !strcmp(p_item->psz_value, - p_parser->psz_object_name) ) + if( p_item->value.psz && !strcmp(p_item->value.psz, + module_GetObjName( p_parser )) ) [o_popup selectItem:[o_popup lastItem]]; } - } while( p_config->i_type != CONFIG_HINT_END && p_config++ ); + } } } vlc_list_release( p_list ); @@ -1360,50 +1354,52 @@ if( MACOS_VERSION >= 10.3 ) \ { NSString *newval = [o_popup titleOfSelectedItem]; char *returnval = NULL; - int i_index; + int i_module_index; vlc_list_t *p_list; module_t *p_parser; p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); - for( i_index = 0; i_index < p_list->i_count; i_index++ ) + for( i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) { - p_parser = (module_t *)p_list->p_values[i_index].p_object ; + p_parser = (module_t *)p_list->p_values[i_module_index].p_object; + 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: 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; } } } else { - module_config_t *p_config; - if( !strcmp( p_parser->psz_object_name, "main" ) ) - continue; + int i; - p_config = p_parser->p_config; - if( p_config ) do + if( !strcmp( module_GetObjName( p_parser ), "main" ) ) + continue; + unsigned int confsize, unused; + module_GetConfig( p_parser, &confsize ); + for ( i = 0; i < confsize; 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->i_value == p_item->i_min ) + p_config->value.i == p_item->min.i ) { NSString *o_description = [[VLCMain sharedInstance] - localizedString: 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; } } - } while( p_config->i_type != CONFIG_HINT_END && p_config++ ); + } } } vlc_list_release( p_list ); @@ -1416,7 +1412,7 @@ if( MACOS_VERSION >= 10.3 ) \ withView: (NSView *)o_parent_view { NSRect mainFrame = [o_parent_view frame]; - NSString *o_labelString, *o_tooltip, *o_textfieldString; + NSString *o_labelString, *o_tooltip; mainFrame.size.height = 23; mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1; mainFrame.origin.x = LEFTMARGIN; @@ -1428,12 +1424,12 @@ if( MACOS_VERSION >= 10.3 ) \ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -1443,19 +1439,13 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the stepper */ ADD_STEPPER( o_stepper, mainFrame, mainFrame.size.width - 19, 0, o_tooltip, -1600, 1600) - [o_stepper setIntValue: p_item->i_value]; + [o_stepper setIntValue: p_item->value.i]; [o_stepper setAutoresizingMask:NSViewMaxXMargin ]; [self addSubview: o_stepper]; - /* build the textfield */ - if( p_item->psz_value ) - o_textfieldString = [[VLCMain sharedInstance] - localizedString: p_item->psz_value]; - else - o_textfieldString = [NSString stringWithString: @""]; ADD_TEXTFIELD( o_textfield, mainFrame, mainFrame.size.width - 19 - 52, 1, 49, o_tooltip, @"" ) - [o_textfield setIntValue: p_item->i_value]; + [o_textfield setIntValue: p_item->value.i]; [o_textfield setDelegate: self]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(textfieldChanged:) @@ -1527,7 +1517,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -1537,13 +1527,13 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the textfield */ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_COMBO( o_combo, mainFrame, [o_label frame].size.width, -2, 0, o_textfieldTooltip ) [o_combo setAutoresizingMask:NSViewWidthSizable ]; for( i_index = 0; i_index < p_item->i_list; i_index++ ) { - if( p_item->i_value == p_item->pi_list[i_index] ) + if( p_item->value.i == p_item->pi_list[i_index] ) { [o_combo selectItemAtIndex: i_index]; } @@ -1592,7 +1582,7 @@ if( MACOS_VERSION >= 10.3 ) \ { if( p_item->ppsz_list_text && p_item->ppsz_list_text[i_index] ) return [[VLCMain sharedInstance] - localizedString: p_item->ppsz_list_text[i_index]]; + localizedString: (char *)p_item->ppsz_list_text[i_index]]; else return [NSString stringWithFormat: @"%i", p_item->pi_list[i_index]]; } @@ -1616,7 +1606,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -1626,10 +1616,10 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the textfield */ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2, 28, 49, o_tooltip, @"" ) - [o_textfield setIntValue: p_item->i_value]; + [o_textfield setIntValue: p_item->value.i]; [o_textfield setAutoresizingMask:NSViewMaxXMargin ]; [o_textfield setDelegate: self]; [[NSNotificationCenter defaultCenter] addObserver: self @@ -1640,7 +1630,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the mintextfield */ ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888" ) - [o_textfield_min setIntValue: p_item->i_min]; + [o_textfield_min setIntValue: p_item->min.i]; [o_textfield_min setAutoresizingMask:NSViewMaxXMargin ]; [o_textfield_min setAlignment:NSRightTextAlignment]; [self addSubview: o_textfield_min]; @@ -1648,7 +1638,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the maxtextfield */ ADD_LABEL( o_textfield_max, mainFrame, mainFrame.size.width - 31, -30, @"8888" ) - [o_textfield_max setIntValue: p_item->i_max]; + [o_textfield_max setIntValue: p_item->max.i]; [o_textfield_max setAutoresizingMask:NSViewMinXMargin ]; [self addSubview: o_textfield_max]; @@ -1658,8 +1648,8 @@ if( MACOS_VERSION >= 10.3 ) \ [o_textfield_max frame].size.width - [o_textfield_max frame].size.width - 14 - [o_textfield_min frame].origin.x, o_tooltip, - p_item->i_min, p_item->i_max ) - [o_slider setIntValue: p_item->i_value]; + p_item->min.i, p_item->max.i ) + [o_slider setIntValue: p_item->value.i]; [o_slider setAutoresizingMask:NSViewWidthSizable ]; [o_slider setTarget: self]; [o_slider setAction: @selector(sliderChanged:)]; @@ -1713,7 +1703,7 @@ if( MACOS_VERSION >= 10.3 ) \ withView: (NSView *)o_parent_view { NSRect mainFrame = [o_parent_view frame]; - NSString *o_labelString, *o_tooltip, *o_textfieldString; + NSString *o_labelString, *o_tooltip; mainFrame.size.height = 23; mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1; mainFrame.origin.x = LEFTMARGIN; @@ -1725,12 +1715,12 @@ if( MACOS_VERSION >= 10.3 ) \ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -2, o_labelString ) @@ -1740,19 +1730,14 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the stepper */ ADD_STEPPER( o_stepper, mainFrame, mainFrame.size.width - 19, 0, o_tooltip, -1600, 1600) - [o_stepper setFloatValue: p_item->f_value]; + [o_stepper setFloatValue: p_item->value.f]; [o_stepper setAutoresizingMask:NSViewMaxXMargin ]; [self addSubview: o_stepper]; /* build the textfield */ - if( p_item->psz_value ) - o_textfieldString = [[VLCMain sharedInstance] - localizedString: p_item->psz_value]; - else - o_textfieldString = [NSString stringWithString: @""]; ADD_TEXTFIELD( o_textfield, mainFrame, mainFrame.size.width - 19 - 52, 1, 49, o_tooltip, @"" ) - [o_textfield setFloatValue: p_item->f_value]; + [o_textfield setFloatValue: p_item->value.f]; [o_textfield setDelegate: self]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(textfieldChanged:) @@ -1821,7 +1806,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -1831,10 +1816,10 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the textfield */ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2, 28, 49, o_tooltip, @"" ) - [o_textfield setFloatValue: p_item->f_value]; + [o_textfield setFloatValue: p_item->value.f]; [o_textfield setAutoresizingMask:NSViewMaxXMargin ]; [o_textfield setDelegate: self]; [[NSNotificationCenter defaultCenter] addObserver: self @@ -1845,7 +1830,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the mintextfield */ ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888" ) - [o_textfield_min setFloatValue: p_item->f_min]; + [o_textfield_min setFloatValue: p_item->min.f]; [o_textfield_min setAutoresizingMask:NSViewMaxXMargin ]; [o_textfield_min setAlignment:NSRightTextAlignment]; [self addSubview: o_textfield_min]; @@ -1853,7 +1838,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the maxtextfield */ ADD_LABEL( o_textfield_max, mainFrame, mainFrame.size.width - 31, -30, @"8888" ) - [o_textfield_max setFloatValue: p_item->f_max]; + [o_textfield_max setFloatValue: p_item->max.f]; [o_textfield_max setAutoresizingMask:NSViewMinXMargin ]; [self addSubview: o_textfield_max]; @@ -1862,9 +1847,9 @@ if( MACOS_VERSION >= 10.3 ) \ [o_textfield_min frame].size.width + 6, -1, mainFrame.size.width - [o_textfield_max frame].size.width - [o_textfield_max frame].size.width - 14 - - [o_textfield_min frame].origin.x, o_tooltip, p_item->f_min, - p_item->f_max ) - [o_slider setFloatValue: p_item->f_value]; + [o_textfield_min frame].origin.x, o_tooltip, p_item->min.f, + p_item->max.f ) + [o_slider setFloatValue: p_item->value.f]; [o_slider setAutoresizingMask:NSViewWidthSizable ]; [o_slider setTarget: self]; [o_slider setAction: @selector(sliderChanged:)]; @@ -1930,201 +1915,41 @@ if( MACOS_VERSION >= 10.3 ) \ { i_view_type = CONFIG_ITEM_BOOL; - /* add the label */ - if( p_item->psz_text ) - o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; - else - o_labelString = [NSString stringWithString:@""]; - ADD_LABEL( o_label, mainFrame, 0, 0, o_labelString ) - [o_label setAutoresizingMask:NSViewNotSizable ]; - [self addSubview: o_label]; /* add the checkbox */ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; - ADD_CHECKBOX( o_checkbox, mainFrame, [o_label frame].size.width, - 0, @"", o_tooltip, p_item->i_value, NSImageLeft) + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; + ADD_CHECKBOX( o_checkbox, mainFrame, 0, + 0, @"", o_tooltip, p_item->value.i, NSImageLeft) [o_checkbox setAutoresizingMask:NSViewNotSizable ]; [self addSubview: o_checkbox]; - } - return self; -} - -- (void) alignWithXPosition:(int)i_xPos -{ - NSRect frame; - frame = [o_label frame]; - frame.origin.x = i_xPos - frame.size.width - 3; - [o_label setFrame:frame]; - - frame = [o_checkbox frame]; - frame.origin.x = i_xPos; - [o_checkbox setFrame:frame]; -} - -- (void)dealloc -{ - [o_checkbox release]; - [super dealloc]; -} - -- (int)intValue -{ - return [o_checkbox intValue]; -} - -@end - -@implementation KeyConfigControlBefore103 - -- (id) initWithItem: (module_config_t *)_p_item - withView: (NSView *)o_parent_view -{ - NSRect mainFrame = [o_parent_view frame]; - NSString *o_labelString, *o_tooltip; - mainFrame.size.height = 37; - mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1; - mainFrame.origin.x = LEFTMARGIN; - mainFrame.origin.y = 0; - - if( [super initWithFrame: mainFrame item: _p_item] != nil ) - { - i_view_type = CONFIG_ITEM_KEY_BEFORE_10_3; - /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; - ADD_LABEL( o_label, mainFrame, 0, -10, o_labelString ) + ADD_LABEL( o_label, mainFrame, [o_checkbox frame].size.width, 0, o_labelString ) [o_label setAutoresizingMask:NSViewNotSizable ]; [self addSubview: o_label]; - - /* add the checkboxes */ - o_tooltip = [[VLCMain sharedInstance] wrapString: - [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; - ADD_CHECKBOX( o_cmd_checkbox, mainFrame, - [o_label frame].size.width + 2, 0, - [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN], o_tooltip, - ((((unsigned int)p_item->i_value) & KEY_MODIFIER_COMMAND)?YES:NO), - NSImageLeft ) - [o_cmd_checkbox setState: p_item->i_value & KEY_MODIFIER_COMMAND]; - ADD_CHECKBOX( o_ctrl_checkbox, mainFrame, - [o_cmd_checkbox frame].size.width + - [o_cmd_checkbox frame].origin.x + 6, 0, - [NSString stringWithUTF8String:UP_ARROWHEAD], o_tooltip, - ((((unsigned int)p_item->i_value) & KEY_MODIFIER_CTRL)?YES:NO), - NSImageLeft ) - [o_ctrl_checkbox setState: p_item->i_value & KEY_MODIFIER_CTRL]; - ADD_CHECKBOX( o_alt_checkbox, mainFrame, [o_label frame].size.width + - 2, -2 - [o_cmd_checkbox frame].size.height, - [NSString stringWithUTF8String:OPTION_KEY], o_tooltip, - ((((unsigned int)p_item->i_value) & KEY_MODIFIER_ALT)?YES:NO), - NSImageLeft ) - [o_alt_checkbox setState: p_item->i_value & KEY_MODIFIER_ALT]; - ADD_CHECKBOX( o_shift_checkbox, mainFrame, - [o_cmd_checkbox frame].size.width + - [o_cmd_checkbox frame].origin.x + 6, -2 - - [o_cmd_checkbox frame].size.height, - [NSString stringWithUTF8String:UPWARDS_WHITE_ARROW], o_tooltip, - ((((unsigned int)p_item->i_value) & KEY_MODIFIER_SHIFT)?YES:NO), - NSImageLeft ) - [o_shift_checkbox setState: p_item->i_value & KEY_MODIFIER_SHIFT]; - [self addSubview: o_cmd_checkbox]; - [self addSubview: o_ctrl_checkbox]; - [self addSubview: o_alt_checkbox]; - [self addSubview: o_shift_checkbox]; - - /* build the popup */ - ADD_POPUP( o_popup, mainFrame, [o_shift_checkbox frame].origin.x + - [o_shift_checkbox frame].size.width + 4, - 4, 0, o_tooltip ) - [o_popup setAutoresizingMask:NSViewWidthSizable ]; - - if( o_keys_menu == nil ) - { - unsigned int i; - o_keys_menu = [[NSMenu alloc] initWithTitle: @"Keys Menu"]; - for ( i = 0; i < sizeof(vlc_keys) / sizeof(key_descriptor_t); i++) - if( vlc_keys[i].psz_key_string && *vlc_keys[i].psz_key_string ) - POPULATE_A_KEY( o_keys_menu, - [NSString stringWithCString:vlc_keys[i].psz_key_string] - , vlc_keys[i].i_key_code) - } - [o_popup setMenu:[o_keys_menu copyWithZone:nil]]; - [o_popup selectItemWithTitle: [[VLCMain sharedInstance] - localizedString:KeyToString( - (((unsigned int)p_item->i_value) & ~KEY_MODIFIER ))]]; - [self addSubview: o_popup]; } return self; } -- (void) alignWithXPosition:(int)i_xPos -{ - NSRect frame; - NSRect superFrame = [self frame]; - frame = [o_label frame]; - frame.origin.x = i_xPos - frame.size.width - 3; - [o_label setFrame:frame]; - - frame = [o_cmd_checkbox frame]; - frame.origin.x = i_xPos; - [o_cmd_checkbox setFrame:frame]; - - frame = [o_ctrl_checkbox frame]; - frame.origin.x = [o_cmd_checkbox frame].size.width + - [o_cmd_checkbox frame].origin.x + 4; - [o_ctrl_checkbox setFrame:frame]; - - frame = [o_alt_checkbox frame]; - frame.origin.x = i_xPos; - [o_alt_checkbox setFrame:frame]; - - frame = [o_shift_checkbox frame]; - frame.origin.x = [o_cmd_checkbox frame].size.width + - [o_cmd_checkbox frame].origin.x + 4; - [o_shift_checkbox setFrame:frame]; - - frame = [o_popup frame]; - frame.origin.x = [o_shift_checkbox frame].origin.x + - [o_shift_checkbox frame].size.width + 3; - frame.size.width = superFrame.size.width - frame.origin.x + 2; - [o_popup setFrame:frame]; -} - - (void)dealloc { - [o_cmd_checkbox release]; - [o_ctrl_checkbox release]; - [o_alt_checkbox release]; - [o_shift_checkbox release]; - [o_popup release]; + [o_checkbox release]; [super dealloc]; } - (int)intValue { - unsigned int i_new_key = 0; - - i_new_key |= ([o_cmd_checkbox state] == NSOnState) ? - KEY_MODIFIER_COMMAND : 0; - i_new_key |= ([o_ctrl_checkbox state] == NSOnState) ? - KEY_MODIFIER_CTRL : 0; - i_new_key |= ([o_alt_checkbox state] == NSOnState) ? - KEY_MODIFIER_ALT : 0; - i_new_key |= ([o_shift_checkbox state] == NSOnState) ? - KEY_MODIFIER_SHIFT : 0; - - i_new_key |= StringToKey([[[o_popup selectedItem] title] cString]); - return i_new_key; + return [o_checkbox intValue]; } + @end -@implementation KeyConfigControlAfter103 +@implementation KeyConfigControl - (id) initWithItem: (module_config_t *)_p_item withView: (NSView *)o_parent_view { @@ -2142,7 +1967,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString ) @@ -2152,7 +1977,7 @@ if( MACOS_VERSION >= 10.3 ) \ /* build the popup */ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; ADD_POPUP( o_popup, mainFrame, [o_label frame].origin.x + [o_label frame].size.width + 3, -2, 0, o_tooltip ) @@ -2163,13 +1988,13 @@ if( MACOS_VERSION >= 10.3 ) \ unsigned int i; o_keys_menu = [[NSMenu alloc] initWithTitle: @"Keys Menu"]; for ( i = 0; i < sizeof(vlc_keys) / sizeof(key_descriptor_t); i++) - if( vlc_keys[i].psz_key_string && *vlc_keys[i].psz_key_string ) + if( vlc_keys[i].psz_key_string ) POPULATE_A_KEY( o_keys_menu, - [NSString stringWithCString:vlc_keys[i].psz_key_string] + [NSString stringWithUTF8String:vlc_keys[i].psz_key_string] , vlc_keys[i].i_key_code) } [o_popup setMenu:[o_keys_menu copyWithZone:nil]]; - [o_popup selectItem:[[o_popup menu] itemWithTag:p_item->i_value]]; + [o_popup selectItem:[[o_popup menu] itemWithTag:p_item->value.i]]; [self addSubview: o_popup]; } @@ -2213,36 +2038,42 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) //Fill our array to know how may items we have... vlc_list_t *p_list; module_t *p_parser; - int i_index; + int 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_index = 0; i_index < p_list->i_count; i_index++ ) + for( i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) { - p_parser = (module_t *)p_list->p_values[i_index].p_object ; + 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; - module_config_t *p_config = p_parser->p_config; - if( p_config ) do + unsigned int confsize; + module_GetConfig( p_parser, &confsize ); + + for ( i = 0; i < confsize; i++ ) { + unsigned int unused; + module_config_t *p_config = module_GetConfig( p_parser, &unused ) + i; NSString *o_modulelongname, *o_modulename; NSNumber *o_moduleenabled = nil; + /* Hack: required subcategory is stored in i_min */ if( p_config->i_type == CONFIG_SUBCATEGORY && - p_config->i_value == _p_item->i_min ) + 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->psz_value && - strstr( _p_item->psz_value, p_parser->psz_object_name ) ) + if( _p_item->value.psz && + strstr( _p_item->value.psz, module_GetObjName( p_parser ) ) ) o_moduleenabled = [NSNumber numberWithBool:YES]; else o_moduleenabled = [NSNumber numberWithBool:NO]; @@ -2251,7 +2082,7 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) arrayWithObjects: o_modulename, o_modulelongname, o_moduleenabled, nil]]; } - } while( p_config->i_type != CONFIG_HINT_END && p_config++ ); + } } vlc_list_release( p_list ); @@ -2266,7 +2097,7 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) /* add the label */ if( p_item->psz_text ) o_labelString = [[VLCMain sharedInstance] - localizedString: p_item->psz_text]; + localizedString: (char *)p_item->psz_text]; else o_labelString = [NSString stringWithString:@""]; ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString ) @@ -2276,10 +2107,10 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) /* build the textfield */ o_tooltip = [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] - localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP]; - if( p_item->psz_value ) + localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP]; + if( p_item->value.psz ) o_textfieldString = [[VLCMain sharedInstance] - localizedString: p_item->psz_value]; + localizedString: (char *)p_item->value.psz]; else o_textfieldString = [NSString stringWithString: @""]; ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2, @@ -2298,13 +2129,11 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) o_scrollview = [[[NSScrollView alloc] initWithFrame: s_rc] retain]; [o_scrollview setDrawsBackground: NO]; [o_scrollview setBorderType: NSBezelBorder]; - if( MACOS_VERSION >= 10.3 ) - [o_scrollview setAutohidesScrollers:YES]; + [o_scrollview setAutohidesScrollers:YES]; NSTableView *o_tableview; o_tableview = [[NSTableView alloc] initWithFrame : s_rc]; - if( MACOS_VERSION >= 10.3 ) - [o_tableview setUsesAlternatingRowBackgroundColors:YES]; + [o_tableview setUsesAlternatingRowBackgroundColors:YES]; [o_tableview setHeaderView:nil]; /* TODO: find a good way to fix the row height and text size*/ /* FIXME: support for multiple selection... */ @@ -2316,7 +2145,7 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) [o_dataCell setTitle:@""]; [o_dataCell setFont:[NSFont systemFontOfSize:0]]; NSTableColumn *o_tableColumn = [[NSTableColumn alloc] - initWithIdentifier:[NSString stringWithCString: "Enabled"]]; + initWithIdentifier:@"Enabled"]; [o_tableColumn setHeaderCell: o_headerCell]; [o_tableColumn setDataCell: o_dataCell]; [o_tableColumn setWidth:17]; @@ -2326,7 +2155,7 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) o_dataCell = [[NSTextFieldCell alloc] init]; [o_dataCell setFont:[NSFont systemFontOfSize:12]]; o_tableColumn = [[NSTableColumn alloc] - initWithIdentifier:[NSString stringWithCString: "Module"]]; + initWithIdentifier:@"Module"]; [o_tableColumn setHeaderCell: o_headerCell]; [o_tableColumn setDataCell: o_dataCell]; [o_tableColumn setWidth:388 - 17]; @@ -2380,7 +2209,7 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) - (char *)stringValue { - return strdup( [[o_textfield stringValue] cString] ); + return strdup( [[o_textfield stringValue] UTF8String] ); } @end @@ -2486,11 +2315,9 @@ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST ) - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { - if( [[aTableColumn identifier] isEqualToString: - [NSString stringWithCString:"Enabled"]] ) + if( [[aTableColumn identifier] isEqualToString: @"Enabled"] ) return [[o_modulearray objectAtIndex:rowIndex] objectAtIndex:2]; - if( [[aTableColumn identifier] isEqualToString: - [NSString stringWithCString:"Module"]] ) + if( [[aTableColumn identifier] isEqualToString: @"Module"] ) return [[o_modulearray objectAtIndex:rowIndex] objectAtIndex:1]; return nil;