/*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008-2011 VLC authors and VideoLAN
+* Copyright (C) 2008-2012 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
#import "prefs.h"
#import <vlc_keys.h>
#import <vlc_interface.h>
+#import <vlc_aout_intf.h>
#import <vlc_dialog.h>
#import <vlc_modules.h>
+#import <vlc_plugin.h>
+#import <vlc_config_cat.h>
#import "misc.h"
#import "intf.h"
#import "AppleRemote.h"
+#import "CoreInteraction.h"
-#ifdef HAVE_SPARKLE_SPARKLE_H
-# import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
-#endif
+#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
static VLCSimplePrefs *_o_sharedInstance = nil;
+#pragma mark Initialisation
+
+ (VLCSimplePrefs *)sharedInstance
{
return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
if (OSX_LION)
[o_sprefs_win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
- else
- [o_intf_nativefullscreen_ckb setEnabled:NO];
+
+ [o_hotkeys_listbox setTarget:self];
+ [o_hotkeys_listbox setDoubleAction:@selector(hotkeyTableDoubleClick:)];
/* setup useful stuff */
o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: @"Command-c", @"Command-x", @"Command-v", @"Command-a", @"Command-," , @"Command-h", @"Command-Alt-h", @"Command-Shift-o", @"Command-o", @"Command-d", @"Command-n", @"Command-s", @"Command-z", @"Command-l", @"Command-r", @"Command-3", @"Command-m", @"Command-w", @"Command-Shift-w", @"Command-Shift-c", @"Command-Shift-p", @"Command-i", @"Command-e", @"Command-Shift-e", @"Command-b", @"Command-Shift-m", @"Command-Ctrl-m", @"Command-?", @"Command-Alt-?", nil] retain];
}
else if( [o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier] )
{
- CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings );
+ CreateToolbarItem( _NS(SUBPIC_TITLE), _NS("Subtitles & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings );
}
else if( [o_itemIdent isEqual: VLCInputSettingToolbarIdentifier] )
{
- CreateToolbarItem( _NS("Input & Codecs"), _NS("Input & Codec settings"), @"spref_cone_Input_64", showInputSettings );
+ CreateToolbarItem( _NS(INPUT_TITLE), _NS("Input & Codec settings"), @"spref_cone_Input_64", showInputSettings );
}
else if( [o_itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier] )
{
[o_audio_lastuser_txt setStringValue: _NS("User name")];
[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")];
+ [o_audio_autosavevol_yes_bcell setTitle: _NS("Keep audio level between sessions")];
+ [o_audio_autosavevol_no_bcell setTitle: _NS("Always reset audio start level to:")];
/* hotkeys */
[o_hotkeys_change_btn setTitle: _NS("Change")];
[o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")];
[o_input_mux_box setTitle: _NS("Codecs / Muxers")];
[o_input_net_box setTitle: _NS("Network")];
+ [o_input_avcodec_hw_ckb setTitle: _NS("Hardware Acceleration")];
[o_input_postproc_txt setStringValue: _NS("Post-Processing Quality")];
[o_input_rtsp_ckb setTitle: _NS("Use RTP over RTSP (TCP)")];
[o_input_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")];
+ [o_input_mkv_preload_dir_ckb setTitle: _NS("Preload MKV files in the same directory")];
/* interface */
[o_intf_style_txt setStringValue: _NS("Interface style")];
[o_intf_embedded_ckb setTitle: _NS("Show video within the main window")];
[o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode on OS X Lion")];
[o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
- [o_intf_lang_txt setStringValue: _NS("Language")];
[o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
- [o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")];
- [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
+ [o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")];
+ [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
[o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
[o_intf_last_update_lbl setStringValue: @""];
[o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
+ [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
+ [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
/* Subtitles and OSD */
[o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
[o_osd_osd_ckb setTitle: _NS("Enable OSD")];
[o_osd_opacity_txt setStringValue: _NS("Opacity")];
[o_osd_forcebold_ckb setTitle: _NS("Force Bold")];
- [o_osd_moreoptions_txt setStringValue: _NS("More options on background, shadow and outline are available in the advanced preferences.")];
+ [o_osd_outline_color_txt setStringValue: _NS("Outline Color")];
+ [o_osd_outline_thickness_txt setStringValue: _NS("Outline Thickness")];
/* video */
[o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];
[o_video_display_box setTitle: _NS("Display")];
[o_video_enable_ckb setTitle: _NS("Enable Video")];
[o_video_fullscreen_ckb setTitle: _NS("Fullscreen")];
+ [o_video_videodeco_ckb setTitle: _NS("Window decorations")];
[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_format_txt setStringValue: _NS("Format")];
[o_video_snap_prefix_txt setStringValue: _NS("Prefix")];
[o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")];
+ [o_video_deinterlace_txt setStringValue: _NS("Deinterlace")];
+ [o_video_deinterlace_mode_txt setStringValue: _NS("Deinterlace mode")];
+ [o_video_video_box setTitle: _NS("Video")];
/* generic stuff */
[o_sprefs_showAll_btn setTitle: _NS("Show All")];
return NULL;
}
+#pragma mark -
+#pragma mark Setup controls
+
- (void)setupButton: (NSPopUpButton *)object forStringList: (const char *)name
{
module_config_t *p_item;
/* serious problem, if no item found */
assert( p_item );
- for( int i = 0; i < p_item->i_list; i++ )
+ for( int i = 0; i < p_item->list_count; i++ )
{
NSMenuItem *mi;
- if( p_item->ppsz_list_text != NULL )
- mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->ppsz_list_text[i] ) action:NULL keyEquivalent: @""];
- else if( p_item->ppsz_list[i] && strcmp(p_item->ppsz_list[i],"") == 0 )
+ if( p_item->list_text != NULL )
+ mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->list_text[i] ) action:NULL keyEquivalent: @""];
+ else if( p_item->list.psz[i] && strcmp(p_item->list.psz[i],"") == 0 )
{
[[object menu] addItem: [NSMenuItem separatorItem]];
continue;
}
- else if( p_item->ppsz_list[i] )
- mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]] action:NULL keyEquivalent: @""];
+ else if( p_item->list.psz[i] )
+ mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithUTF8String: p_item->list.psz[i]] action:NULL keyEquivalent: @""];
else
msg_Err( p_intf, "item %d of pref %s failed to be created", i, name );
- [mi setRepresentedObject:[NSString stringWithUTF8String: p_item->ppsz_list[i]]];
+ [mi setRepresentedObject:[NSString stringWithUTF8String: p_item->list.psz[i]]];
[[object menu] addItem: [mi autorelease]];
- if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) )
+ if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->list.psz[i] ) )
[object selectItem:[object lastItem]];
}
[object setToolTip: _NS( p_item->psz_longtext )];
/* serious problem, if no item found */
assert( p_item );
- for( int i = 0; i < p_item->i_list; i++ )
+ for( int i = 0; i < p_item->list_count; i++ )
{
NSMenuItem *mi;
- if( p_item->ppsz_list_text != NULL)
- mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->ppsz_list_text[i] ) action:NULL keyEquivalent: @""];
- else if( p_item->pi_list[i] )
- mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: @"%d", p_item->pi_list[i]] action:NULL keyEquivalent: @""];
+ if( p_item->list_text != NULL)
+ mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->list_text[i] ) action:NULL keyEquivalent: @""];
+ else if( p_item->list.i[i] )
+ mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: @"%d", p_item->list.i[i]] action:NULL keyEquivalent: @""];
else
msg_Err( p_intf, "item %d of pref %s failed to be created", i, name);
- [mi setRepresentedObject:[NSNumber numberWithInt: p_item->pi_list[i]]];
+ [mi setRepresentedObject:[NSNumber numberWithInt: p_item->list.i[i]]];
[[object menu] addItem: [mi autorelease]];
- if( p_item->value.i == p_item->pi_list[i] )
+ if( p_item->value.i == p_item->list.i[i] )
[object selectItem:[object lastItem]];
}
[object setToolTip: _NS( p_item->psz_longtext )];
p_parser = p_list[i_index];
if( module_provides( p_parser, p_item->psz_type ) )
{
- [object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser ) ?: ""]];
+ [object addItemWithTitle: [NSString stringWithUTF8String: _(module_GetLongName( p_parser )) ?: ""]];
if( p_item->value.psz && !strcmp( p_item->value.psz, module_get_object( p_parser ) ) )
[object selectItem: [object lastItem]];
}
- (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
{
[object setState: config_GetInt( p_intf, name )];
- [object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, name )]];
+ [object setToolTip: _NS(config_GetLabel( p_intf, name ) ?: "")];
}
- (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option
{
char *psz_tmp = config_GetPsz( p_intf, psz_option );
[o_object setStringValue: [NSString stringWithUTF8String: psz_tmp ?: ""]];
- [o_object setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, psz_option )]];
+ [o_object setToolTip: _NS(config_GetLabel( p_intf, psz_option ))];
free( psz_tmp );
}
/**********************
* interface settings *
**********************/
- [self setupButton: o_intf_lang_pop forStringList: "language"];
[self setupButton: o_intf_art_pop forIntList: "album-art"];
[self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
+
[self setupButton: o_intf_nativefullscreen_ckb forBoolValue: "macosx-nativefullscreenmode"];
+ BOOL b_correct_sdk = NO;
+#ifdef MAC_OS_X_VERSION_10_7
+ b_correct_sdk = YES;
+#endif
+ if( !( b_correct_sdk && OSX_LION ))
+ {
+ [o_intf_nativefullscreen_ckb setState: NSOffState];
+ [o_intf_nativefullscreen_ckb setEnabled: NO];
+ }
+
[self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"];
- [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
- [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
-#ifdef HAVE_SPARKLE_SPARKLE_H
+
+ [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
+
+ [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
[o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
else
-#endif
[o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
psz_tmp = config_GetPsz( p_intf, "control" );
if (psz_tmp) {
[o_intf_style_dark_bcell setState: NO];
[o_intf_style_bright_bcell setState: YES];
}
+ [self setupButton: o_intf_autoresize_ckb forBoolValue: "macosx-video-autoresize"];
+ [self setupButton: o_intf_pauseminimized_ckb forBoolValue: "macosx-pause-minimized"];
/******************
* audio settings *
******************/
[self setupButton: o_audio_enable_ckb forBoolValue: "audio"];
- i = (config_GetInt( p_intf, "volume" ) * 0.390625);
- [o_audio_vol_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "volume")]];
- [o_audio_vol_fld setIntValue: i];
- [o_audio_vol_sld setToolTip: [o_audio_vol_fld toolTip]];
- [o_audio_vol_sld setIntValue: i];
+
+ if ( config_GetInt( p_intf, "volume-save" ))
+ {
+ [o_audio_autosavevol_yes_bcell setState: NSOnState];
+ [o_audio_autosavevol_no_bcell setState: NSOffState];
+ [o_audio_vol_fld setEnabled: NO];
+ [o_audio_vol_sld setEnabled: NO];
+
+ [o_audio_vol_sld setIntValue: 100];
+ [o_audio_vol_fld setIntValue: 100];
+ }
+ else
+ {
+ [o_audio_autosavevol_yes_bcell setState: NSOffState];
+ [o_audio_autosavevol_no_bcell setState: NSOnState];
+ [o_audio_vol_fld setEnabled: YES];
+ [o_audio_vol_sld setEnabled: YES];
+
+ i = config_GetInt( p_intf, "volume" );
+ i = i * 200.0 / AOUT_VOLUME_MAX + 0.5;
+ [o_audio_vol_sld setIntValue: i];
+ [o_audio_vol_fld setIntValue: i];
+ }
[self setupButton: o_audio_spdif_ckb forBoolValue: "spdif"];
[self setupButton: o_video_onTop_ckb forBoolValue: "video-on-top"];
[self setupButton: o_video_skipFrames_ckb forBoolValue: "skip-frames"];
[self setupButton: o_video_black_ckb forBoolValue: "macosx-black"];
+ [self setupButton: o_video_videodeco_ckb forBoolValue: "video-deco"];
[self setupButton: o_video_output_pop forModuleList: "vout"];
[self setupField: o_video_snap_prefix_fld forOption:"snapshot-prefix"];
[self setupButton: o_video_snap_seqnum_ckb forBoolValue: "snapshot-sequential"];
[self setupButton: o_video_snap_format_pop forStringList: "snapshot-format"];
+ [self setupButton: o_video_deinterlace_pop forIntList: "deinterlace"];
+ [self setupButton: o_video_deinterlace_mode_pop forStringList: "deinterlace-mode"];
/***************************
* input & codecs settings *
[self setupField: o_input_httpproxy_fld forOption:"http-proxy"];
[self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"];
[o_input_postproc_fld setIntValue: config_GetInt( p_intf, "postproc-q")];
- [o_input_postproc_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "postproc-q")]];
+ [o_input_postproc_fld setToolTip: _NS(config_GetLabel( p_intf, "postproc-q"))];
+ [self setupButton: o_input_avcodec_hw_ckb forBoolValue:"avcodec-hw"];
[self setupButton: o_input_avi_pop forIntList: "avi-index"];
[self setupButton: o_input_rtsp_ckb forBoolValue: "rtsp-tcp"];
- [self setupButton: o_input_skipLoop_pop forIntList: "ffmpeg-skiploopfilter"];
+ [self setupButton: o_input_skipLoop_pop forIntList: "avcodec-skiploopfilter"];
+
+ [self setupButton: o_input_mkv_preload_dir_ckb forBoolValue: "mkv-preload-local-dir"];
[o_input_cachelevel_pop removeAllItems];
[o_input_cachelevel_pop addItemsWithTitles:
[[o_input_cachelevel_pop itemAtIndex: 1] setTag: 100];
[[o_input_cachelevel_pop itemAtIndex: 2] setTag: 200];
[[o_input_cachelevel_pop itemAtIndex: 3] setTag: 300];
- [[o_input_cachelevel_pop itemAtIndex: 4] setTag: 400];
- [[o_input_cachelevel_pop itemAtIndex: 5] setTag: 500];
+ [[o_input_cachelevel_pop itemAtIndex: 4] setTag: 500];
+ [[o_input_cachelevel_pop itemAtIndex: 5] setTag: 1000];
-#define TestCaC( name ) \
+ #define TestCaC( name, factor ) \
b_cache_equal = b_cache_equal && \
- ( i_cache == config_GetInt( p_intf, name ) )
-
-#define TestCaCi( name, int ) \
- b_cache_equal = b_cache_equal && \
- ( ( i_cache * int ) == config_GetInt( p_intf, name ) )
+ ( i_cache * factor == config_GetInt( p_intf, name ) );
/* Select the accurate value of the PopupButton */
bool b_cache_equal = true;
int i_cache = config_GetInt( p_intf, "file-caching");
- TestCaC( "network-caching" );
- TestCaC( "disc-caching" );
- TestCaC( "live-caching" );
+ TestCaC( "network-caching", 10/3 );
+ TestCaC( "disc-caching", 1 );
+ TestCaC( "live-caching", 1 );
if( b_cache_equal )
{
[o_input_cachelevel_pop selectItemWithTag: i_cache];
[o_input_cachelevel_pop selectItemWithTitle: _NS("Custom")];
[o_input_cachelevel_custom_txt setHidden: NO];
}
+ #undef TestCaC
/*********************
* subtitle settings *
[self setupField: o_osd_font_fld forOption: "freetype-font"];
[self setupButton: o_osd_font_color_pop forIntList: "freetype-color"];
[self setupButton: o_osd_font_size_pop forIntList: "freetype-rel-fontsize"];
- i = config_GetInt( p_intf, "freetype-opacity" );
+ i = config_GetInt( p_intf, "freetype-opacity" ) * 100.0 / 255.0 + 0.5;
[o_osd_opacity_fld setIntValue: i];
[o_osd_opacity_sld setIntValue: i];
- [o_osd_opacity_sld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "freetype-opacity")]];
+ [o_osd_opacity_sld setToolTip: _NS(config_GetLabel( p_intf, "freetype-opacity"))];
[o_osd_opacity_fld setToolTip: [o_osd_opacity_sld toolTip]];
[self setupButton: o_osd_forcebold_ckb forBoolValue: "freetype-bold"];
+ [self setupButton: o_osd_outline_color_pop forIntList: "freetype-outline-color"];
+ [self setupButton: o_osd_outline_thickness_pop forIntList: "freetype-outline-thickness"];
/********************
* hotkeys settings *
assert( p_main );
unsigned confsize;
module_config_t *p_config;
-
+
p_config = module_config_get (p_main, &confsize);
-
+
for (size_t i = 0; i < confsize; i++)
{
module_config_t *p_item = p_config + i;
[o_hotkeys_listbox reloadData];
}
+#pragma mark -
+#pragma mark General actions
+
- (void)showSimplePrefs
{
/* we want to show the interface settings, if no category was chosen */
[o_sprefs_win makeKeyAndOrderFront: self];
}
+- (void)showSimplePrefsWithLevel:(NSInteger)i_window_level
+{
+ [o_sprefs_win setLevel: i_window_level];
+ [self showSimplePrefs];
+}
+
- (IBAction)buttonAction:(id)sender
{
if( sender == o_sprefs_cancel_btn )
+ {
+ [[NSFontPanel sharedFontPanel] close];
[o_sprefs_win orderOut: sender];
+ }
else if( sender == o_sprefs_save_btn )
{
[self saveChangedSettings];
+ [[NSFontPanel sharedFontPanel] close];
[o_sprefs_win orderOut: sender];
}
else if( sender == o_sprefs_reset_btn )
else if( sender == o_sprefs_showAll_btn )
{
[o_sprefs_win orderOut: self];
- [[[VLCMain sharedInstance] preferences] showPrefs];
+ [[[VLCMain sharedInstance] preferences] showPrefsWithLevel:[o_sprefs_win level]];
}
else
msg_Warn( p_intf, "unknown buttonAction sender" );
{
module_config_t *p_item;
module_t *p_parser, **p_list;
+ NSString * objectTitle = [[object selectedItem] title];
p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
if( p_item->i_type == CONFIG_ITEM_MODULE && module_provides( p_parser, p_item->psz_type ) )
{
- if( [[[object selectedItem] title] isEqualToString: _NS( module_GetLongName( p_parser ) )] )
+ if( [objectTitle isEqualToString: _NS( module_GetLongName( p_parser ) )] )
{
config_PutPsz( p_intf, name, strdup( module_get_object( p_parser )));
break;
}
}
module_list_free( p_list );
- if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] )
+ if( [objectTitle isEqualToString: _NS( "Default" )] )
config_PutPsz( p_intf, name, "" );
}
**********************/
if( b_intfSettingChanged )
{
- SaveStringList( o_intf_lang_pop, "language" );
SaveIntList( o_intf_art_pop, "album-art" );
config_PutInt( p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state] );
config_PutInt( p_intf, "embedded-video", [o_intf_embedded_ckb state] );
- config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] );
+
+ config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] );
config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] );
config_PutInt( p_intf, "macosx-interfacestyle", [o_intf_style_dark_bcell state] );
config_PutInt( p_intf, "macosx-nativefullscreenmode", [o_intf_nativefullscreen_ckb state] );
+ config_PutInt( p_intf, "macosx-pause-minimized", [o_intf_pauseminimized_ckb state] );
+ config_PutInt( p_intf, "macosx-video-autoresize", [o_intf_autoresize_ckb state] );
if( [o_intf_enableGrowl_ckb state] == NSOnState )
{
tmpString = getString( "control" );
}
}
- /* activate stuff without restart */
- if( [o_intf_appleremote_ckb state] == YES )
- [[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]];
- else
- [[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]];
+ /* activate stuff without restart */
+ if( [o_intf_appleremote_ckb state] == YES )
+ [[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]];
+ else
+ [[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]];
b_intfSettingChanged = NO;
}
if( b_audioSettingChanged )
{
config_PutInt( p_intf, "audio", [o_audio_enable_ckb state] );
- config_PutInt( p_intf, "volume", ([o_audio_vol_sld intValue] * 2.56));
+ if( [o_audio_vol_fld isEnabled] )
+ config_PutInt( p_intf, "volume", [o_audio_vol_fld intValue] * AOUT_VOLUME_MAX / 200.0 + 0.5 );
+ config_PutInt( p_intf, "volume-save", [o_audio_autosavevol_yes_bcell state] );
config_PutInt( p_intf, "spdif", [o_audio_spdif_ckb state] );
SaveIntList( o_audio_dolby_pop, "force-dolby-surround" );
{
config_PutInt( p_intf, "video", [o_video_enable_ckb state] );
config_PutInt( p_intf, "fullscreen", [o_video_fullscreen_ckb state] );
+ config_PutInt( p_intf, "video-deco", [o_video_videodeco_ckb state] );
config_PutInt( p_intf, "video-on-top", [o_video_onTop_ckb state] );
config_PutInt( p_intf, "skip-frames", [o_video_skipFrames_ckb state] );
config_PutInt( p_intf, "macosx-black", [o_video_black_ckb state] );
config_PutPsz( p_intf, "snapshot-prefix", [[o_video_snap_prefix_fld stringValue] UTF8String] );
config_PutInt( p_intf, "snapshot-sequential", [o_video_snap_seqnum_ckb state] );
SaveStringList( o_video_snap_format_pop, "snapshot-format" );
+ SaveIntList( o_video_deinterlace_pop, "deinterlace" );
+ SaveStringList( o_video_deinterlace_mode_pop, "deinterlace-mode" );
b_videoSettingChanged = NO;
}
SaveIntList( o_input_avi_pop, "avi-index" );
config_PutInt( p_intf, "rtsp-tcp", [o_input_rtsp_ckb state] );
- SaveIntList( o_input_skipLoop_pop, "ffmpeg-skiploopfilter" );
-
- #define CaCi( name, int ) config_PutInt( p_intf, name, int * [[o_input_cachelevel_pop selectedItem] tag] )
- #define CaC( name ) CaCi( name, 1 )
- msg_Dbg( p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] );
- CaC( "network-caching" );
- CaC( "disc-caching" );
- CaC( "live-caching" );
+ config_PutInt( p_intf, "avcodec-hw", [o_input_avcodec_hw_ckb state] );
+ SaveIntList( o_input_skipLoop_pop, "avcodec-skiploopfilter" );
+
+ config_PutInt( p_intf, "mkv-preload-local-dir", [o_input_mkv_preload_dir_ckb state] );
+
+ #define CaC( name, factor ) config_PutInt( p_intf, name, [[o_input_cachelevel_pop selectedItem] tag] * factor )
+ if ( [[o_input_cachelevel_pop selectedItem] tag] == 0 )
+ {
+ msg_Dbg( p_intf, "Custom chosen, not adjusting cache values" );
+ }
+ else
+ {
+ msg_Dbg( p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] );
+ CaC( "file-caching", 1 );
+ CaC( "network-caching", 10/3 );
+ CaC( "disc-caching", 1 );
+ CaC( "live-caching", 1 );
+ }
+ #undef CaC
b_inputSettingChanged = NO;
}
config_PutPsz( p_intf, "freetype-font", [[o_osd_font_fld stringValue] UTF8String] );
SaveIntList( o_osd_font_color_pop, "freetype-color" );
SaveIntList( o_osd_font_size_pop, "freetype-rel-fontsize" );
- config_PutInt( p_intf, "freetype-opacity", [o_osd_opacity_sld intValue] );
+ config_PutInt( p_intf, "freetype-opacity", [o_osd_opacity_fld intValue] * 255.0 / 100.0 + 0.5 );
config_PutInt( p_intf, "freetype-bold", [o_osd_forcebold_ckb state] );
+ SaveIntList( o_osd_outline_color_pop, "freetype-outline-color" );
+ SaveIntList( o_osd_outline_thickness_pop, "freetype-outline-thickness" );
b_osdSettingChanged = NO;
}
b_hotkeyChanged = NO;
}
+ [[VLCCoreInteraction sharedInstance] fixPreferences];
+
/* okay, let's save our changes to vlcrc */
config_SaveConfigFile( p_intf );
[o_currentlyShownCategoryView retain];
}
+#pragma mark -
+#pragma mark Specific actions
+
- (IBAction)interfaceSettingChanged:(id)sender
{
+ if( sender == o_intf_embedded_ckb && [o_intf_embedded_ckb state] == NSOffState )
+ [o_intf_nativefullscreen_ckb setState: NSOffState];
+
+ if( sender == o_intf_nativefullscreen_ckb && [o_intf_nativefullscreen_ckb state] == NSOnState )
+ [o_intf_embedded_ckb setState: NSOnState];
+
+ if( sender == o_intf_embedded_ckb )
+ [[VLCCoreInteraction sharedInstance] stop];
+
b_intfSettingChanged = YES;
}
}
}
+ if( sender == o_audio_autosavevol_matrix )
+ {
+ BOOL enableVolumeSlider = [o_audio_autosavevol_matrix selectedTag] == 1;
+ [o_audio_vol_fld setEnabled: enableVolumeSlider];
+ [o_audio_vol_sld setEnabled: enableVolumeSlider];
+ }
+
b_audioSettingChanged = YES;
}
[self showSettingsForCategory: o_osd_view];
}
+- (void)controlTextDidChange:(NSNotification *)o_notification
+{
+ id notificationObject = [o_notification object];
+ if( notificationObject == o_audio_lang_fld ||
+ notificationObject == o_audio_lastpwd_sfld ||
+ notificationObject == o_audio_lastuser_fld ||
+ notificationObject == o_audio_vol_fld )
+ b_audioSettingChanged = YES;
+ else if( notificationObject == o_input_record_fld ||
+ notificationObject == o_input_httpproxy_fld ||
+ notificationObject == o_input_httpproxypwd_sfld ||
+ notificationObject == o_input_postproc_fld )
+ b_inputSettingChanged = YES;
+ else if( notificationObject == o_osd_font_fld ||
+ notificationObject == o_osd_lang_fld ||
+ notificationObject == o_osd_opacity_fld)
+ b_osdSettingChanged = YES;
+ else if( notificationObject == o_video_snap_folder_fld ||
+ notificationObject == o_video_snap_prefix_fld )
+ b_videoSettingChanged = YES;
+}
+
- (IBAction)showFontPicker:(id)sender
{
char * font = config_GetPsz( p_intf, "freetype-font" );
- NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil;
+ NSString * fontName = font ? [NSString stringWithUTF8String: font] : nil;
free(font);
- if( fontFamilyName )
+ if( fontName )
{
- NSFontDescriptor * fd = [NSFontDescriptor fontDescriptorWithFontAttributes:nil];
- NSFont * font = [NSFont fontWithDescriptor:[fd fontDescriptorWithFamily:fontFamilyName] textTransform:nil];
+ NSFont * font = [NSFont fontWithName:fontName size:0.0];
[[NSFontManager sharedFontManager] setSelectedFont:font isMultiple:NO];
}
[[NSFontManager sharedFontManager] setTarget: self];
- (void)changeFont:(id)sender
{
NSFont * font = [sender convertFont:[[NSFontManager sharedFontManager] selectedFont]];
- [o_osd_font_fld setStringValue:[font familyName]];
+ [o_osd_font_fld setStringValue:[font fontName]];
[self osdSettingChanged:self];
}
[self showSettingsForCategory: o_input_view];
}
+#pragma mark -
+#pragma mark Hotkey actions
+
+- (void)hotkeyTableDoubleClick:(id)object
+{
+ // -1 is header
+ if( [o_hotkeys_listbox clickedRow] >= 0 )
+ [self hotkeySettingChanged:o_hotkeys_listbox];
+}
+
- (IBAction)hotkeySettingChanged:(id)sender
{
if( sender == o_hotkeys_change_btn || sender == o_hotkeys_listbox )
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
{
- if( [[aTableColumn identifier] isEqualToString: @"action"] )
+ NSString * identifier = [aTableColumn identifier];
+
+ if( [identifier isEqualToString: @"action"] )
return [o_hotkeyDescriptions objectAtIndex: rowIndex];
- else if( [[aTableColumn identifier] isEqualToString: @"shortcut"] )
+ else if( [identifier isEqualToString: @"shortcut"] )
return [self OSXStringKeyToString:[o_hotkeySettings objectAtIndex: rowIndex]];
else
{
- msg_Err( p_intf, "unknown TableColumn identifier (%s)!", [[aTableColumn identifier] UTF8String] );
+ msg_Err( p_intf, "unknown TableColumn identifier (%s)!", [identifier UTF8String] );
return NULL;
}
}
[o_hotkeys_change_taken_lbl setStringValue: [NSString stringWithFormat:
_NS("This combination is already taken by \"%@\"."),
[o_hotkeyDescriptions objectAtIndex: i_returnValue2]]];
-
else
[o_hotkeys_change_taken_lbl setStringValue: @""];
{
NSMutableString *tempString = [[[NSMutableString alloc] init] autorelease];
NSString *keyString = [o_theEvent characters];
- unichar key = [keyString characterAtIndex:0];
+
+ unichar key = [keyString characterAtIndex:0];
+ NSUInteger i_modifiers = [o_theEvent modifierFlags];
/* modifiers */
- if( [o_theEvent modifierFlags] & NSControlKeyMask )
+ if( i_modifiers & NSControlKeyMask )
[tempString appendString:@"Ctrl-"];
- if( [o_theEvent modifierFlags] & NSAlternateKeyMask )
+ if( i_modifiers & NSAlternateKeyMask )
[tempString appendString:@"Alt-"];
- if( [o_theEvent modifierFlags] & NSShiftKeyMask )
+ if( i_modifiers & NSShiftKeyMask )
[tempString appendString:@"Shift-"];
- if( [o_theEvent modifierFlags] & NSCommandKeyMask )
+ if( i_modifiers & NSCommandKeyMask )
[tempString appendString:@"Command-"];
/* non character keys */
projects / vlc / blobdiff