[vlc-devel] commit: macosx: fallback on freetype if quartztext isn't present ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jun 13 15:20:50 2009 +0200| [9e3a83958c7658e63c867aa496d230281ade0b27] | committer: Felix Paul Kühne 

macosx: fallback on freetype if quartztext isn't present

This only happen in 64bit mode.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9e3a83958c7658e63c867aa496d230281ade0b27
---

 modules/gui/macosx/simple_prefs.m |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 2d61c26..0fbbb51 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -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 );