/*****************************************************************************
* 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 "misc.h"
#import "intf.h"
#import "AppleRemote.h"
+#import "CoreInteraction.h"
#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
[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_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_update_ckb setTitle: _NS("Automatically check for updates")];
[o_intf_last_update_lbl setStringValue: @""];
[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")];
/* 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 )];
/**********************
* 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_audio_enable_ckb forBoolValue: "audio"];
- if ( config_GetInt( p_intf, "macosx-autosave-volume" ))
+ if ( config_GetInt( p_intf, "volume-save" ))
{
[o_audio_autosavevol_yes_bcell setState: NSOnState];
[o_audio_autosavevol_no_bcell setState: NSOffState];
[o_audio_vol_sld setEnabled: YES];
i = config_GetInt( p_intf, "volume" );
- i = i * 200 / AOUT_VOLUME_MAX;
+ i = i * 200.0 / AOUT_VOLUME_MAX + 0.5;
[o_audio_vol_sld setIntValue: i];
[o_audio_vol_fld setIntValue: i];
}
[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_httpproxypwd_sfld forOption:"http-proxy-pwd"];
[o_input_postproc_fld setIntValue: config_GetInt( 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"];
[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: _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 *
[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, "audio", [o_audio_enable_ckb state] );
if( [o_audio_vol_fld isEnabled] )
- config_PutInt( p_intf, "volume", [o_audio_vol_fld intValue] * AOUT_VOLUME_MAX / 200 );
- config_PutInt( p_intf, "macosx-autosave-volume", [o_audio_autosavevol_yes_bcell state] );
+ 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" );
+ 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] );
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 );
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;
}
- (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];
}
- (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;
}
}
NSString *keyString = [o_theEvent characters];
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