Commit 9e3a8395 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fallback on freetype if quartztext isn't present

This only happen in 64bit mode.
parent d66f3c87
......@@ -570,18 +570,15 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
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
{
[o_osd_font_fld setEnabled: NO];
[o_osd_font_color_pop setEnabled: NO];
[o_osd_font_size_pop setEnabled: NO];
[o_osd_font_color_pop removeAllItems];
[o_osd_font_size_pop removeAllItems];
[o_osd_font_btn setEnabled: NO];
/* 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"];
}
......@@ -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_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 );
......
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