/*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008 the VideoLAN team
+* Copyright (C) 2008-2009 the VideoLAN team
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
#import "prefs.h"
#import <vlc_keys.h>
#import <vlc_interface.h>
+#import <vlc_dialog.h>
#import "misc.h"
+#import "intf.h"
+#import "AppleRemote.h"
+#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";
[[[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_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_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_skipLoop_txt setStringValue: _NS("Skip the loop filter for H.264 decoding")];
[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_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_mediakeys_bg_ckb setTitle: _NS("...when VLC is in background")];
+ [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
+ [o_intf_last_update_lbl setStringValue: @""];
+
/* 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_btn setTitle: _NS("Choose...")];
[o_osd_font_color_txt setStringValue: _NS("Font Color")];
[o_osd_font_size_txt setStringValue: _NS("Font Size")];
[o_osd_font_txt setStringValue: _NS("Font")];
[o_sprefs_win setTitle: _NS("Preferences")];
}
+/* TODO: move this part to core */
+#define config_GetLabel(a,b) __config_GetLabel(VLC_OBJECT(a),b)
+static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_name )
+{
+ module_config_t *p_config;
+
+ p_config = config_FindConfig( p_this, psz_name );
+
+ /* sanity checks */
+ if( !p_config )
+ {
+ msg_Err( p_this, "option %s does not exist", psz_name );
+ return NULL;
+ }
+
+ if ( p_config->psz_longtext )
+ return p_config->psz_longtext;
+ else if( p_config->psz_text )
+ return p_config->psz_text;
+ else
+ msg_Warn( p_this, "option %s does not include any help" );
+
+ return NULL;
+}
+
- (void)setupButton: (NSPopUpButton *)object forStringList: (const char *)name
{
module_config_t *p_item;
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] && p_item->ppsz_list[i] == "" )
+ else if( p_item->ppsz_list[i] && strcmp(p_item->ppsz_list[i],"") == 0 )
{
[[object menu] addItem: [NSMenuItem separatorItem]];
continue;
- (void)setupButton: (NSPopUpButton *)object forModuleList: (const char *)name
{
module_config_t *p_item;
- vlc_list_t *p_list;
- module_t *p_parser;
+ module_t *p_parser, **p_list;
int y = 0;
[object removeAllItems];
p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
- p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = module_list_get( NULL );
if( !p_item ||!p_list )
{
- if( p_list ) vlc_list_release(p_list);
+ if( p_list ) module_list_free(p_list);
NSLog( @"serious problem, item or list not found" );
return;
}
[object addItemWithTitle: _NS("Default")];
- for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( size_t i_index = 0; p_list[i_index]; i_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object;
- if( p_parser && module_IsCapable( p_parser, p_item->psz_type ) )
+ p_parser = p_list[i_index];
+ if( module_provides( p_parser, p_item->psz_type ) )
{
[object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser ) ?: ""]];
- if( p_item->value.psz && !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) )
+ if( p_item->value.psz && !strcmp( p_item->value.psz, module_get_object( p_parser ) ) )
[object selectItem: [object lastItem]];
}
}
- vlc_list_release( p_list );
+ module_list_free( p_list );
[object setToolTip: _NS(p_item->psz_longtext)];
}
+- (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
+{
+ [object setState: config_GetInt( p_intf, name )];
+ [object setToolTip: [NSString stringWithUTF8String: 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 )]];
+ free( psz_tmp );
+}
+
- (void)resetControls
{
module_config_t *p_item;
[self setupButton: o_intf_lang_pop forStringList: "language"];
[self setupButton: o_intf_art_pop forIntList: "album-art"];
- [o_intf_fspanel_ckb setState: config_GetInt( p_intf, "macosx-fspanel" )];
- [o_intf_embedded_ckb setState: config_GetInt( p_intf, "embedded-video" )];
+ [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
+ [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"];
+ [self setupButton: o_intf_mediakeys_bg_ckb forBoolValue: "macosx-mediakeys-background"];
+ [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]];
+ 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
+ [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
/******************
* audio settings *
******************/
- [o_audio_enable_ckb setState: config_GetInt( p_intf, "audio" )];
- [o_audio_vol_fld setIntValue: config_GetInt( p_intf, "volume" )];
- [o_audio_vol_sld setIntValue: config_GetInt( p_intf, "volume" )];
+ [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];
- [o_audio_spdif_ckb setState: config_GetInt( p_intf, "spdif" )];
+ [self setupButton: o_audio_spdif_ckb forBoolValue: "spdif"];
[self setupButton: o_audio_dolby_pop forIntList: "force-dolby-surround"];
+ [self setupField: o_audio_lang_fld forOption: "audio-language"];
- [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" ) ?: ""]];
+ [self setupButton: o_audio_headphone_ckb forBoolValue: "headphone-dolby"];
- [o_audio_headphone_ckb setState: config_GetInt( p_intf, "headphone-dolby" )];
-
psz_tmp = config_GetPsz( p_intf, "audio-filter" );
if( psz_tmp )
- [o_audio_norm_ckb setState: (int)strstr( psz_tmp, "normvol" )];
+ {
+ [o_audio_norm_ckb setState: (NSInteger)strstr( psz_tmp, "volnorm" )];
+ [o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]];
+ [o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]];
+ free( psz_tmp );
+ }
[o_audio_norm_fld setFloatValue: config_GetFloat( p_intf, "norm-max-level" )];
+ [o_audio_norm_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "norm-max-level")]];
[self setupButton: o_audio_visual_pop forModuleList: "audio-visual"];
/* Last.FM is optional */
- if( module_Exists( p_intf, "audioscrobbler" ) )
+ if( module_exists( "audioscrobbler" ) )
{
- [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" ) ?: ""]];
- [o_audio_lastpwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" ) ?: ""]];
+ [self setupField: o_audio_lastuser_fld forOption:"lastfm-username"];
+ [self setupField: o_audio_lastpwd_sfld forOption:"lastfm-password"];
if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
{
/******************
* video settings *
******************/
- [o_video_enable_ckb setState: config_GetInt( p_intf, "video" )];
- [o_video_fullscreen_ckb setState: config_GetInt( p_intf, "fullscreen" )];
- [o_video_onTop_ckb setState: config_GetInt( p_intf, "video-on-top" )];
- [o_video_skipFrames_ckb setState: config_GetInt( p_intf, "skip-frames" )];
- [o_video_black_ckb setState: config_GetInt( p_intf, "macosx-black" )];
+ [self setupButton: o_video_enable_ckb forBoolValue: "video"];
+ [self setupButton: o_video_fullscreen_ckb forBoolValue: "fullscreen"];
+ [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_output_pop forModuleList: "vout"];
[o_video_device_pop selectItemAtIndex: 0];
[o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )];
- [o_video_snap_folder_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-path" ) ?: ""]];
- [o_video_snap_prefix_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-prefix" ) ?: ""]];
- [o_video_snap_seqnum_ckb setState: config_GetInt( p_intf, "snapshot-sequential" )];
+ [self setupField: o_video_snap_folder_fld forOption:"snapshot-path"];
+ [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"];
/***************************
* input & codecs settings *
***************************/
- [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port" )];
- if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
- [o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" ) ?: ""]];
- if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
- [o_input_httpproxypwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy-pwd" ) ?: ""]];
- [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "ffmpeg-pp-q" )];
+ [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port")];
+ [o_input_serverport_fld setToolTip: [NSString stringWithUTF8String: config_GetLabel( p_intf, "server-port")]];
+ [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")]];
[self setupButton: o_input_avi_pop forIntList: "avi-index"];
- [o_input_rtsp_ckb setState: config_GetInt( p_intf, "rtsp-tcp" )];
-
- psz_tmp = config_GetPsz( p_intf, "access-filter" );
- if( psz_tmp )
- {
- [o_input_record_ckb setState: (int)strstr( psz_tmp, "record" )];
- [o_input_dump_ckb setState: (int)strstr( psz_tmp, "dump" )];
- [o_input_bandwidth_ckb setState: (int)strstr( psz_tmp, "bandwidth" )];
- [o_input_timeshift_ckb setState: (int)strstr( psz_tmp, "timeshift" )];
- }
+ [self setupButton: o_input_rtsp_ckb forBoolValue: "rtsp-tcp"];
+ [self setupButton: o_input_skipLoop_pop forIntList: "ffmpeg-skiploopfilter"];
[o_input_cachelevel_pop removeAllItems];
[o_input_cachelevel_pop addItemsWithTitles:
int i_cache = config_GetInt( p_intf, "file-caching");
TestCaC( "udp-caching" );
- if( module_Exists (p_intf, "dvdread") )
+ if( module_exists ("dvdread") )
TestCaC( "dvdread-caching" );
- if( module_Exists (p_intf, "dvdnav") )
+ if( module_exists ("dvdnav") )
TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" );
TestCaC( "fake-caching" );
TestCaCi( "rtsp-caching", 4 );
TestCaCi( "ftp-caching", 2 );
TestCaCi( "http-caching", 4 );
- if(module_Exists (p_intf, "access_realrtsp"))
+ if(module_exists ("access_realrtsp"))
TestCaCi( "realrtsp-caching", 10 );
TestCaCi( "mms-caching", 19 );
if( b_cache_equal )
/*********************
* subtitle settings *
*********************/
- [o_osd_osd_ckb setState: config_GetInt( p_intf, "osd" )];
+ [self setupButton: o_osd_osd_ckb forBoolValue: "osd"];
[self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"];
-
- [o_osd_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "sub-language" ) ?: ""]];
- if( config_GetPsz( p_intf, "freetype-font" ) != NULL )
- [o_osd_font_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "freetype-font" ) ?: ""]];
+ [self setupField: o_osd_lang_fld forOption: "sub-language" ];
+
+ if( module_exists( "quartztext" ) )
+ {
+ [self setupField: o_osd_font_fld forOption: "quartztext-font"];
+ [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
+ [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
+ }
+ else
+ {
+ /* fallback on freetype */
+ [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"];
+ /* selector button is useless in this case */
+ [o_osd_font_btn setEnabled: NO];
+ }
- [self setupButton: o_osd_font_color_pop forIntList: "freetype-color"];
- [self setupButton: o_osd_font_size_pop forIntList: "freetype-rel-fontsize"];
/********************
* hotkeys settings *
********************/
- struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+ const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+ [o_hotkeySettings release];
o_hotkeySettings = [[NSMutableArray alloc] init];
NSMutableArray *o_tempArray_desc = [[NSMutableArray alloc] init];
i = 1;
i++;
}
+ [o_hotkeyDescriptions release];
o_hotkeyDescriptions = [[NSArray alloc] initWithArray: o_tempArray_desc copyItems: YES];
[o_tempArray_desc release];
[o_hotkeys_listbox reloadData];
[o_sprefs_win orderOut: self];
[[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState];
[[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState];
- [[[VLCMain sharedInstance] getPreferences] showPrefs];
+ [[[VLCMain sharedInstance] preferences] showPrefs];
}
else
msg_Warn( p_intf, "unknown buttonAction sender" );
if( i_return == NSAlertAlternateReturn )
{
config_ResetAll( p_intf );
- b_intfSettingChanged = b_videoSettingChanged = b_audioSettingChanged = YES;
[self resetControls];
+ config_SaveConfigFile( p_intf, NULL );
}
}
p_item = config_FindConfig( VLC_OBJECT(p_intf), name );
p_stringobject = (NSString *)[[object selectedItem] representedObject];
assert([p_stringobject isKindOfClass:[NSString class]]);
- if( p_stringobject ) config_PutPsz( p_intf, name, [p_stringobject UTF8String] );
+ if( p_stringobject )
+ {
+ config_PutPsz( p_intf, name, [p_stringobject UTF8String] );
+ [p_stringobject release];
+ }
}
static inline void save_module_list( intf_thread_t * p_intf, id object, const char * name )
{
module_config_t *p_item;
- module_t *p_parser;
- vlc_list_t *p_list;
+ module_t *p_parser, **p_list;
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_list = module_list_get( NULL );
+ for( size_t i_module_index = 0; p_list[i_module_index]; i_module_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
+ p_parser = p_list[i_module_index];
- if( p_item->i_type == CONFIG_ITEM_MODULE && module_IsCapable( p_parser, p_item->psz_type ) )
+ 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 ) )] )
{
- config_PutPsz( p_intf, name, strdup( module_GetObjName( p_parser )));
+ config_PutPsz( p_intf, name, strdup( module_get_object( p_parser )));
break;
}
}
}
- vlc_list_release( p_list );
+ module_list_free( p_list );
if( [[[object selectedItem] title] isEqualToString: _NS( "Default" )] )
config_PutPsz( p_intf, name, "" );
}
{
char *psz_tmp;
int i;
- NSString *p_stringobject;
#define SaveIntList( object, name ) save_int_list( p_intf, object, name )
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-mediakeys", [o_intf_mediakeys_ckb state] );
+ config_PutInt( p_intf, "macosx-mediakeys-background", [o_intf_mediakeys_bg_ckb state] );
+
+ /* activate stuff without restart */
+ if( [o_intf_appleremote_ckb state] == YES )
+ [[[VLCMain sharedInstance] appleRemoteController] startListening: [VLCMain sharedInstance]];
+ else
+ [[[VLCMain sharedInstance] appleRemoteController] stopListening: [VLCMain sharedInstance]];
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
+ object: nil
+ userInfo: nil];
/* okay, let's save our changes to vlcrc */
i = config_SaveConfigFile( p_intf, "main" );
if( i != 0 )
{
msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i );
- intf_UserFatal( p_intf, false, _("Interface Settings not saved"),
+ dialog_Fatal( p_intf, _("Interface Settings not saved"),
_("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0;
}
if( b_audioSettingChanged )
{
config_PutInt( p_intf, "audio", [o_audio_enable_ckb state] );
- config_PutInt( p_intf, "volume", [o_audio_vol_sld intValue] );
+ config_PutInt( p_intf, "volume", ([o_audio_vol_sld intValue] * 2.56));
+ NSLog( @"slider=%i, pref=%i", [o_audio_vol_sld intValue], config_GetInt( p_intf, "volume" ));
config_PutInt( p_intf, "spdif", [o_audio_spdif_ckb state] );
SaveIntList( o_audio_dolby_pop, "force-dolby-surround" );
config_PutPsz( p_intf, "audio-language", [[o_audio_lang_fld stringValue] UTF8String] );
config_PutInt( p_intf, "headphone-dolby", [o_audio_headphone_ckb state] );
- psz_tmp = config_GetPsz( p_intf, "audio-filter" );
- if(! psz_tmp)
- config_PutPsz( p_intf, "audio-filter", "volnorm" );
- else if( (int)strstr( psz_tmp, "normvol" ) == NO )
+ if( [o_audio_norm_ckb state] == NSOnState )
{
- /* work-around a GCC 4.0.1 bug */
- psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String];
- config_PutPsz( p_intf, "audio-filter", psz_tmp );
+ psz_tmp = config_GetPsz( p_intf, "audio-filter" );
+ if(! psz_tmp)
+ config_PutPsz( p_intf, "audio-filter", "volnorm" );
+ else if( (NSInteger)strstr( psz_tmp, "normvol" ) == NO )
+ {
+ /* work-around a GCC 4.0.1 bug */
+ psz_tmp = (char *)[[NSString stringWithFormat: @"%s:volnorm", psz_tmp] UTF8String];
+ config_PutPsz( p_intf, "audio-filter", psz_tmp );
+ free( psz_tmp );
+ }
}
else
{
- psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String];
- psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String];
- psz_tmp = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String];
- config_PutPsz( p_intf, "audio-filter", psz_tmp );
+ psz_tmp = config_GetPsz( p_intf, "audio-filter" );
+ if( psz_tmp )
+ {
+ char *psz_tmp2 = (char *)[[[NSString stringWithUTF8String: psz_tmp] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@":volnorm"]] UTF8String];
+ psz_tmp2 = (char *)[[[NSString stringWithUTF8String: psz_tmp2] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm:"]] UTF8String];
+ psz_tmp2 = (char *)[[[NSString stringWithUTF8String: psz_tmp2] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"volnorm"]] UTF8String];
+ config_PutPsz( p_intf, "audio-filter", psz_tmp );
+ free( psz_tmp );
+ }
}
config_PutFloat( p_intf, "norm-max-level", [o_audio_norm_fld floatValue] );
SaveModuleList( o_audio_visual_pop, "audio-visual" );
/* Last.FM is optional */
- if( module_Exists( p_intf, "audioscrobbler" ) )
+ if( module_exists( "audioscrobbler" ) )
{
[o_audio_last_ckb setEnabled: YES];
if( [o_audio_last_ckb state] == NSOnState )
if( i != 0 )
{
msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i );
- intf_UserFatal( p_intf, false, _("Audio Settings not saved"),
+ dialog_Fatal( p_intf, _("Audio Settings not saved"),
_("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0;
if( i != 0 )
{
msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i );
- intf_UserFatal( p_intf, false, _("Video Settings not saved"),
+ dialog_Fatal( p_intf, _("Video Settings not saved"),
_("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0;
}
config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] );
config_PutPsz( p_intf, "http-proxy", [[o_input_httpproxy_fld stringValue] UTF8String] );
config_PutPsz( p_intf, "http-proxy-pwd", [[o_input_httpproxypwd_sfld stringValue] UTF8String] );
- config_PutInt( p_intf, "ffmpeg-pp-q", [o_input_postproc_fld intValue] );
+ config_PutInt( p_intf, "postproc-q", [o_input_postproc_fld intValue] );
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", [[o_input_cachelevel_pop selectedItem] tag] );
+ msg_Dbg( p_intf, "Adjusting all cache values to: %i", (int)[[o_input_cachelevel_pop selectedItem] tag] );
CaC( "udp-caching" );
- if( module_Exists (p_intf, "dvdread" ) )
+ if( module_exists ( "dvdread" ) )
{
CaC( "dvdread-caching" );
i = i + config_SaveConfigFile( p_intf, "dvdread" );
}
- if( module_Exists (p_intf, "dvdnav" ) )
+ if( module_exists ( "dvdnav" ) )
{
CaC( "dvdnav-caching" );
i = i + config_SaveConfigFile( p_intf, "dvdnav" );
CaC( "screen-caching" );
CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 );
CaCi( "http-caching", 4 );
- if( module_Exists (p_intf, "access_realrtsp" ) )
+ if( module_exists ( "access_realrtsp" ) )
{
CaCi( "realrtsp-caching", 10 );
i = i + config_SaveConfigFile( p_intf, "access_realrtsp" );
}
CaCi( "mms-caching", 19 );
- #define SaveAccessFilter( object, name ) \
- if( [object state] == NSOnState ) \
- { \
- if( b_first ) \
- { \
- [o_temp appendString: name]; \
- b_first = NO; \
- } \
- else \
- [o_temp appendFormat: @":%@", name]; \
- }
-
- BOOL b_first = YES;
- NSMutableString *o_temp = [[NSMutableString alloc] init];
- SaveAccessFilter( o_input_record_ckb, @"record" );
- SaveAccessFilter( o_input_dump_ckb, @"dump" );
- SaveAccessFilter( o_input_bandwidth_ckb, @"bandwidth" );
- SaveAccessFilter( o_input_timeshift_ckb, @"timeshift" );
- config_PutPsz( p_intf, "access-filter", [o_temp UTF8String] );
- [o_temp release];
-
i = config_SaveConfigFile( p_intf, "main" );
- i = i + config_SaveConfigFile( p_intf, "ffmpeg" );
+ i = i + config_SaveConfigFile( p_intf, "avcodec" );
+ i = i + config_SaveConfigFile( p_intf, "postproc" );
i = i + config_SaveConfigFile( p_intf, "access_http" );
i = i + config_SaveConfigFile( p_intf, "access_file" );
i = i + config_SaveConfigFile( p_intf, "access_tcp" );
if( i != 0 )
{
msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i );
- intf_UserFatal( p_intf, false, _("Input Settings not saved"),
+ dialog_Fatal( p_intf, _("Input Settings not saved"),
_("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0;
}
config_PutInt( p_intf, "osd", [o_osd_osd_ckb state] );
if( [o_osd_encoding_pop indexOfSelectedItem] >= 0 )
- config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] );
+ SaveStringList( o_osd_encoding_pop, "subsdec-encoding" );
+ else
+ config_PutPsz( p_intf, "subsdec-encoding", "" );
config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
- 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" );
+
+ if( module_exists( "quartztext" ) )
+ {
+ config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] );
+ SaveIntList( o_osd_font_color_pop, "quartztext-color" );
+ SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" );
+ }
+ else
+ {
+ /* fallback on freetype */
+ 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" );
+ }
i = config_SaveConfigFile( p_intf, NULL );
if( i != 0 )
{
msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i );
- intf_UserFatal( p_intf, false, _("On Screen Display/Subtitle Settings not saved"),
+ dialog_Fatal( p_intf, _("On Screen Display/Subtitle Settings not saved"),
_("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0;
}
********************/
if( b_hotkeyChanged )
{
- struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
+ const struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
i = 1;
while( i < [o_hotkeySettings count] )
{
if( i != 0 )
{
msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i );
- intf_UserFatal( p_intf, false, _("Hotkeys not saved"),
+ dialog_Fatal( p_intf, _("Hotkeys not saved"),
_("An error occured while saving your settings via SimplePrefs (%i)."), i );
i = 0;
}
- (IBAction)interfaceSettingChanged:(id)sender
{
+ if( sender == o_intf_mediakeys_ckb )
+ [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]];
b_intfSettingChanged = YES;
}
if( sender == o_audio_vol_fld )
[o_audio_vol_sld setIntValue: [o_audio_vol_fld intValue]];
+ if( sender == o_audio_norm_ckb )
+ {
+ [o_audio_norm_stepper setEnabled: [o_audio_norm_ckb state]];
+ [o_audio_norm_fld setEnabled: [o_audio_norm_ckb state]];
+ }
+
if( sender == o_audio_last_ckb )
{
if( [o_audio_last_ckb state] == NSOnState )
[o_video_snap_folder_fld setStringValue: [o_selectFolderPanel filename]];
b_videoSettingChanged = YES;
}
- else if( contextInfo == o_osd_font_btn )
- {
- [o_osd_font_fld setStringValue: [o_selectFolderPanel filename]];
- b_osdSettingChanged = YES;
- }
}
[o_selectFolderPanel release];
- (IBAction)osdSettingChanged:(id)sender
{
- if( sender == o_osd_font_btn )
- {
- o_selectFolderPanel = [[NSOpenPanel alloc] init];
- [o_selectFolderPanel setCanChooseDirectories: NO];
- [o_selectFolderPanel setCanChooseFiles: YES];
- [o_selectFolderPanel setResolvesAliases: YES];
- [o_selectFolderPanel setAllowsMultipleSelection: NO];
- [o_selectFolderPanel setMessage: _NS("Choose the font to display your Subtitles with.")];
- [o_selectFolderPanel setCanCreateDirectories: NO];
- [o_selectFolderPanel setPrompt: _NS("Choose")];
- [o_selectFolderPanel setAllowedFileTypes: [NSArray arrayWithObjects: @"dfont", @"ttf", @"otf", @"FFIL", nil]];
- [o_selectFolderPanel beginSheetForDirectory: @"/System/Library/Fonts/" file: nil modalForWindow: o_sprefs_win
- modalDelegate: self
- didEndSelector: @selector(savePanelDidEnd:returnCode:contextInfo:)
- contextInfo: o_osd_font_btn];
- }
- else
- b_osdSettingChanged = YES;
+ b_osdSettingChanged = YES;
}
- (void)showOSDSettings
[self showSettingsForCategory: o_osd_view];
}
+- (IBAction)showFontPicker:(id)sender
+{
+ if( module_exists( "quartztext" ) )
+ {
+ char * font = config_GetPsz( p_intf, "quartztext-font" );
+ NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil;
+ free(font);
+ if( fontFamilyName )
+ {
+ NSFontDescriptor * fd = [NSFontDescriptor fontDescriptorWithFontAttributes:nil];
+ NSFont * font = [NSFont fontWithDescriptor:[fd fontDescriptorWithFamily:fontFamilyName] textTransform:nil];
+ [[NSFontManager sharedFontManager] setSelectedFont:font isMultiple:NO];
+ }
+ [[NSFontManager sharedFontManager] setTarget: self];
+ [[NSFontPanel sharedFontPanel] orderFront:self];
+ }
+}
+
+- (void)changeFont:(id)sender
+{
+ NSFont * font = [sender convertFont:[[NSFontManager sharedFontManager] selectedFont]];
+ [o_osd_font_fld setStringValue:[font familyName]];
+ [self osdSettingChanged:self];
+}
+
- (IBAction)inputSettingChanged:(id)sender
{
if( sender == o_input_cachelevel_pop )
}
else if( sender == o_hotkeys_change_ok_btn )
{
- int i_returnValue;
+ NSInteger i_returnValue;
if(! o_keyInTransition )
{
[NSApp stopModal];
- (BOOL)changeHotkeyTo: (int)i_theNewKey
{
- int i_returnValue;
+ NSInteger i_returnValue;
i_returnValue = [o_hotkeysNonUseableKeys indexOfObject: [NSNumber numberWithInt: i_theNewKey]];
if( i_returnValue != NSNotFound || i_theNewKey == 0 )
{
if( key )
{
i_key |= CocoaKeyToVLC( key );
- return [[[VLCMain sharedInstance] getSimplePreferences] changeHotkeyTo: i_key];
+ return [[[VLCMain sharedInstance] simplePreferences] changeHotkeyTo: i_key];
}
return FALSE;
}
@end
+
+@implementation VLCSimplePrefsWindow
+
+- (BOOL)acceptsFirstResponder
+{
+ return YES;
+}
+
+- (void)changeFont:(id)sender
+{
+ [[[VLCMain sharedInstance] simplePreferences] changeFont: sender];
+}
+@end
projects / vlc / blobdiff