Skip to content

V
vlc-2-2
Commit 9e3a8395 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fallback on freetype if quartztext isn't present 

This only happen in 64bit mode.
parent d66f3c87
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
modules/gui/macosx/simple_prefs.m
View file @ 9e3a8395
...@@ -570,18 +570,15 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -570,18 +570,15 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
if( module_exists( "quartztext" ) ) if( module_exists( "quartztext" ) )
{ {
[self setupField: o_osd_font_fld forOption: "quartztext-font"]; [self setupField: o_osd_font_fld forOption: "quartztext-font"];
[self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"]; [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
[self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"]; [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
} }
else else
{ {
[o_osd_font_fld setEnabled: NO]; /* fallback on freetype */
[o_osd_font_color_pop setEnabled: NO]; [self setupField: o_osd_font_fld forOption: "freetype-font"];
[o_osd_font_size_pop setEnabled: NO]; [self setupButton: o_osd_font_color_pop forIntList: "freetype-color"];
[o_osd_font_color_pop removeAllItems]; [self setupButton: o_osd_font_size_pop forIntList: "freetype-rel-fontsize"];
[o_osd_font_size_pop removeAllItems];
[o_osd_font_btn setEnabled: NO];
} }
...@@ -942,6 +939,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -942,6 +939,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
SaveIntList( o_osd_font_color_pop, "quartztext-color" ); SaveIntList( o_osd_font_color_pop, "quartztext-color" );
SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" ); 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 ); i = config_SaveConfigFile( p_intf, NULL );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment