#import "simple_prefs.h"
#import "prefs.h"
#import <vlc_keys.h>
+#import "misc.h"
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
if( val & KEY_MODIFIER_COMMAND )
[o_temp_str appendString: [NSString stringWithUTF8String: "\xE2\x8C\x98"]];
- unsigned int i_keys = sizeof(vlc_keys)/sizeof(key_descriptor_t);
- for( unsigned int i = 0; i< i_keys; i++ )
- {
- if( vlc_keys[i].i_key_code == (val& ~KEY_MODIFIER) )
- {
- if( vlc_keys[i].psz_key_string )
- [o_temp_str appendString: [NSString stringWithUTF8String: vlc_keys[i].psz_key_string]];
- else
- o_temp_str = @"Unset";
- }
- }
+ const char *base = KeyToString( val & ~KEY_MODIFIER );
+ if( base )
+ [o_temp_str appendString: [NSString stringWithUTF8String: base]];
+ else
+ o_temp_str = @"Unset";
return o_temp_str;
}
[o_sprefs_win setToolbar: o_sprefs_toolbar];
/* setup useful stuff */
- /* TODO: hard-code this instead of one-the-run generation */
o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects:
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'c'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'x'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'2'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'3'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'m'],
- [NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'q'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|'w'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w'],
[NSNumber numberWithInt: KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c'],
- (void)initStrings
{
- msg_Warn( p_intf, "localisation of the simple preferences is not implemented!" );
+ /* audio */
+ [o_audio_dolby_txt setStringValue: _NS("Force detection of Dolby Surround")];
+ [o_audio_effects_box setTitle: _NS("Effects")];
+ [o_audio_enable_ckb setTitle: _NS("Enable Audio")];
+ [o_audio_general_box setTitle: _NS("General Audio")];
+ [o_audio_headphone_ckb setTitle: _NS("Headphone surround effect")];
+ [o_audio_lang_txt setStringValue: _NS("Preferred Audio language")];
+ [o_audio_last_ckb setTitle: _NS("Enable Last.fm submissions")];
+ [o_audio_lastpwd_txt setStringValue: _NS("Password")];
+ [o_audio_lastuser_txt setStringValue: _NS("User name")];
+ [o_audio_norm_ckb setTitle: _NS("Volume normalizer")];
+ [o_audio_spdif_ckb setTitle: _NS("Use S/PDIF when available")];
+ [o_audio_visual_txt setStringValue: _NS("Visualization")];
+ [o_audio_vol_txt setStringValue: _NS("Default Volume")];
+
+ /* hotkeys */
+ [o_hotkeys_change_btn setTitle: _NS("Change")];
+ [o_hotkeys_change_win setTitle: _NS("Change Hotkey")];
+ [o_hotkeys_change_cancel_btn setTitle: _NS("Cancel")];
+ [o_hotkeys_change_ok_btn setTitle: _NS("OK")];
+ [o_hotkeys_clear_btn setTitle: _NS("Clear")];
+ [o_hotkeys_lbl setStringValue: _NS("Select an action to change the associated hotkey:")];
+ [[[o_hotkeys_listbox tableColumnWithIdentifier: @"action"] headerCell] setStringValue: _NS("Action")];
+ [[[o_hotkeys_listbox tableColumnWithIdentifier: @"shortcut"] headerCell] setStringValue: _NS("Shortcut")];
+
+ /* input */
+ [o_input_access_box setTitle: _NS("Access Filter")];
+ [o_input_avi_txt setStringValue: _NS("Repair AVI Files")];
+ [o_input_bandwidth_ckb setTitle: _NS("Bandwidth limiter")];
+ [o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")];
+ [o_input_caching_box setTitle: _NS("Caching")];
+ [o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")];
+ [o_input_dump_ckb setTitle: _NS("Dump")];
+ [o_input_httpproxy_txt setStringValue: _NS("HTTP Proxy")];
+ [o_input_mux_box setTitle: _NS("Codecs / Muxers")];
+ [o_input_net_box setTitle: _NS("Network")];
+ [o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
+ [o_input_record_ckb setTitle: _NS("Record")];
+ [o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
+ [o_input_serverport_txt setStringValue: _NS("Default Server Port")];
+ [o_input_timeshift_ckb setTitle: _NS("Timeshift")];
+
+ /* interface */
+ [o_intf_art_txt setStringValue: _NS("Album art download policy")];
+ [o_intf_embedded_ckb setTitle: _NS("Add controls to the video window")];
+ [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
+ [o_intf_lang_txt setStringValue: _NS("Language")];
+ [o_intf_meta_ckb setTitle: _NS("Fetch the metadata from the Internet")];
+ [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
+
+ /* Subtitles and OSD */
+ [o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
+ [o_osd_font_box setTitle: _NS("Display Settings")];
+ [o_osd_font_btn setTitle: _NS("Browse...")];
+ [o_osd_font_color_txt setStringValue: _NS("Font Color")];
+ [o_osd_font_effect_txt setStringValue: _NS("Effect")];
+ [o_osd_font_size_txt setStringValue: _NS("Font Size")];
+ [o_osd_font_txt setStringValue: _NS("Font")];
+ [o_osd_lang_box setTitle: _NS("Subtitle Languages")];
+ [o_osd_lang_txt setStringValue: _NS("Preferred Subtitle Language")];
+ [o_osd_osd_box setTitle: _NS("On Screen Display")];
+ [o_osd_osd_ckb setTitle: _NS("Enable OSD")];
+
+ /* generic stuff */
+ [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
+ [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
+ [o_sprefs_cancel_btn setTitle: _NS("Cancel")];
+ [o_sprefs_reset_btn setTitle: _NS("Reset Preferences")];
+ [o_sprefs_save_btn setTitle: _NS("Save")];
+ [o_sprefs_win setTitle: _NS("Preferences")];
+
+ /* video */
+ [o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];
+ [o_video_device_txt setStringValue: _NS("Display device")];
+ [o_video_display_box setTitle: _NS("Display")];
+ [o_video_enable_ckb setTitle: _NS("Enable Video")];
+ [o_video_fullscreen_ckb setTitle: _NS("Fullscreen")];
+ [o_video_onTop_ckb setTitle: _NS("Always on top")];
+ [o_video_output_txt setStringValue: _NS("Output module")];
+ [o_video_skipFrames_ckb setTitle: _NS("Skip frames")];
+ [o_video_snap_box setTitle: _NS("Video snapshots")];
+ [o_video_snap_folder_btn setTitle: _NS("Browse...")];
+ [o_video_snap_folder_txt setStringValue: _NS("Folder")];
+ [o_video_snap_format_txt setStringValue: _NS("Format")];
+ [o_video_snap_prefix_txt setStringValue: _NS("Prefix")];
+ [o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")];
}
- (void)resetControls
{
module_config_t *p_item;
+ vlc_list_t *p_list;
+ module_t *p_parser;
int i, y = 0;
char *psz_tmp;
- #define SetupIntList( object, name ) \
+#define SetupIntList( object, name ) \
[object removeAllItems]; \
p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
for( i = 0; i < p_item->i_list; i++ ) \
if( p_item->value.i < [object numberOfItems] ) \
[object selectItemAtIndex: p_item->value.i]; \
else \
- [object selectItemAtIndex: 0]
+ [object selectItemAtIndex: 0]; \
+ [object setToolTip: _NS( p_item->psz_longtext )]
- #define SetupStringList( object, name ) \
- [object removeAllItems]; \
- y = 0; \
- p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
- for( i = 0; p_item->ppsz_list[i] != nil; i++ ) \
+#define SetupStringList( object, name ) \
+ [object removeAllItems]; \
+ y = 0; \
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+ for( i = 0; p_item->ppsz_list[i] != nil; i++ ) \
+ { \
+ [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \
+ if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) \
+ y = i; \
+ } \
+ [object selectItemAtIndex: y]; \
+ [object setToolTip: _NS( p_item->psz_longtext )]
+
+#define SetupModuleList( object, name ) \
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \
+ [object removeAllItems]; \
+ [object addItemWithTitle: _NS("Default")]; \
+ for( int i_index = 0; i_index < p_list->i_count; i_index++ ) \
+ { \
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ; \
+ \
+ if( module_IsCapable( p_parser, p_item->psz_type ) ) \
{ \
- [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \
- if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) ) \
- y = i; \
+ [object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser )]]; \
+ \
+ if( p_item->value.psz && !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) ) \
+ [object selectItem: [object lastItem]]; \
} \
- [object selectItemAtIndex: y]
+ } \
+ vlc_list_release( p_list ); \
+ [object setToolTip: _NS(p_item->psz_longtext)]
/**********************
* interface settings *
if( psz_tmp )
[o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )];
[o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )];
-
- // visualizer
- msg_Warn( p_intf, "visualizer not implemented!" );
-
+
+ SetupModuleList( o_audio_visual_pop, "audio-visual" );
+
/* Last.FM is optional */
if( module_Exists( p_intf, "audioscrobbler" ) )
{
[o_audio_lastpwd_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" )]];
if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
+ {
[o_audio_last_ckb setState: NSOnState];
+ [o_audio_lastuser_fld setEnabled: YES];
+ [o_audio_lastpwd_fld setEnabled: YES];
+ }
else
+ {
[o_audio_last_ckb setState: NSOffState];
+ [o_audio_lastuser_fld setEnabled: NO];
+ [o_audio_lastpwd_fld setEnabled: NO];
+ }
}
+ else
+ [o_audio_last_ckb setEnabled: NO];
/******************
* video settings *
[o_video_skipFrames_ckb setState: config_GetInt( p_intf, "skip-frames" )];
[o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )];
- msg_Warn( p_intf, "vout module and display device selectors not implemented!" );
+ SetupModuleList( o_video_output_pop, "vout" );
+
+ [o_video_device_pop removeAllItems];
+ i = 0;
+ y = [[NSScreen screens] count];
+ [o_video_device_pop addItemWithTitle: _NS("Default")];
+ [[o_video_device_pop lastItem] setTag: 0];
+ while( i < y )
+ {
+ NSRect s_rect = [[[NSScreen screens] objectAtIndex: i] frame];
+ [o_video_device_pop addItemWithTitle:
+ [NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1,
+ (int)s_rect.size.width, (int)s_rect.size.height]];
+ [[o_video_device_pop lastItem] setTag: (int)[[[NSScreen screens] objectAtIndex: i] displayID]];
+ i++;
+ }
+ [o_video_device_pop selectItemAtIndex: 0];
+ [o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )];
if( config_GetPsz( p_intf, "snapshot-path" ) != NULL )
[o_video_snap_folder_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-path" )]];
if( module_Exists (p_intf, "dvdnav") )
TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" );
- TestCaC( "fake-caching" );
+ TestCaC( "fake-caching" );
TestCaC( "cdda-caching" );
- TestCaC( "screen-caching" );
+ TestCaC( "screen-caching" );
TestCaC( "vcd-caching" );
- TestCaCi( "rtsp-caching", 4 );
+ TestCaCi( "rtsp-caching", 4 );
TestCaCi( "ftp-caching", 2 );
TestCaCi( "http-caching", 4 );
if(module_Exists (p_intf, "access_realrtsp"))
TestCaCi( "realrtsp-caching", 10 );
TestCaCi( "mms-caching", 19 );
if( b_cache_equal )
+ {
[o_input_cachelevel_pop selectItemWithTag: i_cache];
+ [o_input_cachelevel_custom_txt setHidden: YES];
+ }
else
+ {
[o_input_cachelevel_pop selectItemWithTitle: _NS("Custom")];
+ [o_input_cachelevel_custom_txt setHidden: NO];
+ }
/*********************
* subtitle settings *
[self resetControls];
+ [o_sprefs_win center];
[o_sprefs_win makeKeyAndOrderFront: self];
}
- (void)saveChangedSettings
{
module_config_t *p_item;
+ vlc_list_t *p_list;
+ module_t *p_parser;
char *psz_tmp;
int i;
else \
config_PutPsz( p_intf, name, strdup( [[VLCMain sharedInstance] delocalizeString: [object stringValue]] ) )
+#define SaveModuleList( object, name ) \
+ p_item = config_FindConfig( VLC_OBJECT(p_intf), name ); \
+ \
+ p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); \
+ for( int i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ ) \
+ { \
+ p_parser = (module_t *)p_list->p_values[i_module_index].p_object; \
+ \
+ if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) ) \
+ { \
+ if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] ) \
+ { \
+ config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser ))); \
+ break; \
+ } \
+ } \
+ } \
+ vlc_list_release( p_list ); \
+ if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] ) \
+ config_PutPsz( p_intf, name, "" )
+
/**********************
* interface settings *
**********************/
}
config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] );
- msg_Warn( p_intf, "visualizer not implemented!" );
+ SaveModuleList( o_audio_visual_pop, "audio-visual" );
/* Last.FM is optional */
if( module_Exists( p_intf, "audioscrobbler" ) )
- {
+ {
+ [o_audio_last_ckb setEnabled: YES];
if( [o_audio_last_ckb state] == NSOnState )
config_AddIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
else
config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
config_PutPsz( p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String] );
- config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastuser_fld stringValue] UTF8String] );
+ config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_fld stringValue] UTF8String] );
}
+ else
+ [o_audio_last_ckb setEnabled: NO];
/* okay, let's save our changes to vlcrc */
i = config_SaveConfigFile( p_intf, "main" );
config_PutInt( p_intf, "skip-frames", [o_video_skipFrames_ckb state] );
config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] );
- msg_Warn( p_intf, "vout module and display device selectors not implemented!" );
+ SaveModuleList( o_video_output_pop, "vout" );
+ config_PutInt( p_intf, "macosx-vdev", [[o_video_device_pop selectedItem] tag] );
config_PutPsz( p_intf, "snapshot-path", [[o_video_snap_folder_fld stringValue] UTF8String] );
config_PutPsz( p_intf, "snapshot-prefix", [[o_video_snap_prefix_fld stringValue] UTF8String] );
/* restore our window's height, if we've shown another category previously */
o_old_view_rect = [o_currentlyShownCategoryView frame];
o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height;
+ o_win_rect.origin.y = ( o_win_rect.origin.y + o_old_view_rect.size.height ) - o_view_rect.size.height;
/* remove our previous category view */
[o_currentlyShownCategoryView removeFromSuperviewWithoutNeedingDisplay];
{
if( sender == o_audio_vol_sld )
[o_audio_vol_fld setIntValue: [o_audio_vol_sld intValue]];
-
+
if( sender == o_audio_vol_fld )
[o_audio_vol_sld setIntValue: [o_audio_vol_fld intValue]];
-
+
+ if( sender == o_audio_last_ckb )
+ {
+ if( [o_audio_last_ckb state] == NSOnState )
+ {
+ [o_audio_lastpwd_fld setEnabled: YES];
+ [o_audio_lastuser_fld setEnabled: YES];
+ }
+ else
+ {
+ [o_audio_lastpwd_fld setEnabled: NO];
+ [o_audio_lastuser_fld setEnabled: NO];
+ }
+ }
+
b_audioSettingChanged = YES;
}
- (IBAction)inputSettingChanged:(id)sender
{
+ if( sender == o_input_cachelevel_pop )
+ {
+ if( [[[o_input_cachelevel_pop selectedItem] title] isEqualToString: _NS("Custom")] )
+ [o_input_cachelevel_custom_txt setHidden: NO];
+ else
+ [o_input_cachelevel_custom_txt setHidden: YES];
+ }
+
b_inputSettingChanged = YES;
}
i_returnValue = [o_hotkeySettings indexOfObject: o_keyInTransition];
if( i_returnValue != NSNotFound )
- [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [[NSNumber numberWithInt: 0] retain]];
+ [o_hotkeySettings replaceObjectAtIndex: i_returnValue withObject: [[NSNumber numberWithInt: 0] retain]];
[o_hotkeySettings replaceObjectAtIndex: [o_hotkeys_listbox selectedRow] withObject: [o_keyInTransition retain]];
if( i_returnValue != NSNotFound )
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."),
- [self OSXKeyToString:[[o_hotkeyDescriptions objectAtIndex: i_returnValue] intValue]]]];
+ [o_hotkeyDescriptions objectAtIndex: i_returnValue]]];
else
[o_hotkeys_change_taken_lbl setStringValue: @""];
projects / vlc / blobdiff