From 2169b78fa850f82d234f2dab8bb377d81ad88016 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Tue, 30 Nov 2010 17:40:54 +0100 Subject: [PATCH] macosx: fixed preferences compilation --- modules/gui/macosx/prefs.m | 6 +++--- modules/gui/macosx/prefs_widgets.m | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index 8cee063e8c..8c56c8c285 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -56,7 +56,8 @@ #import "prefs.h" #import "simple_prefs.h" #import "prefs_widgets.h" -#import "vlc_keys.h" +#import +#import /* /!\ Warning: Unreadable code :/ */ @@ -347,8 +348,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; /* Exclude empty plugins (submodules don't have config */ /* options, they are stored in the parent module) */ - if( module_is_main( p_module) ) - { + if( module_is_main( p_module ) ) { pluginItem = self; _configItems = module_config_get( p_module, &confsize ); _configSize = confsize; diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m index 07d61e0a91..0a44940689 100644 --- a/modules/gui/macosx/prefs_widgets.m +++ b/modules/gui/macosx/prefs_widgets.m @@ -33,6 +33,7 @@ #endif #include +#include #include #include "intf.h" @@ -1361,7 +1362,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ if( module_provides( p_parser, p_item->psz_type ) ) { NSString *o_description = [[VLCMain sharedInstance] - localizedString: module_GetLongName( p_parser )]; + localizedString: module_get_name( p_parser, TRUE )]; if( [newval isEqualToString: o_description] ) { returnval = strdup( module_get_object( p_parser )); @@ -1385,7 +1386,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ p_config->value.i == p_item->min.i ) { NSString *o_description = [[VLCMain sharedInstance] - localizedString: module_GetLongName( p_parser )]; + localizedString: module_get_name( p_parser, TRUE )]; if( [newval isEqualToString: o_description] ) { returnval = strdup(module_get_object( p_parser )); @@ -1415,7 +1416,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ if( module_provides( p_parser, p_item->psz_type ) ) { NSString *o_description = [[VLCMain sharedInstance] - localizedString: module_GetLongName( p_parser )]; + localizedString: module_get_name( p_parser, TRUE )]; [o_popup addItemWithTitle: o_description]; char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name ); @@ -1443,7 +1444,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ config_GetInt( VLCIntf, p_item->psz_name) == p_item->min.i ) { NSString *o_description = [[VLCMain sharedInstance] - localizedString: module_GetLongName( p_parser )]; + localizedString: module_get_name( p_parser, TRUE )]; [o_popup addItemWithTitle: o_description]; char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name ); @@ -2093,11 +2094,11 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ o_keys_menu = [[NSMenu alloc] initWithTitle: @"Keys Menu"]; #warning This does not work anymore. FIXME. #if 0 - for ( i = 0; i < sizeof(vlc_keys) / sizeof(key_descriptor_t); i++) - if( vlc_keys[i].psz_key_string ) + for ( i = 0; i < sizeof(vlc_key) / sizeof(key_descriptor_t); i++) + if( vlc_key[i].psz_key_string ) POPULATE_A_KEY( o_keys_menu, - [NSString stringWithUTF8String:vlc_keys[i].psz_key_string] - , vlc_keys[i].i_key_code) + [NSString stringWithUTF8String:vlc_key[i].psz_key_string] + , vlc_key[i].i_key_code) #endif } [o_popup setMenu:[o_keys_menu copyWithZone:nil]]; @@ -2180,7 +2181,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \ p_config->value.i == _p_item->min.i ) { o_modulelongname = [NSString stringWithUTF8String: - module_GetLongName( p_parser )]; + module_get_name( p_parser, TRUE )]; o_modulename = [NSString stringWithUTF8String: module_get_object( p_parser )]; -- 2.39.2