[vlc-devel] commit: freetype: use a sane default font on OS X, so we don' t have to add ugly hacks to keep it working ( Felix Paul Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Wed Sep 16 00:09:56 2009 +0200| [a7f981fcfb31a848120e169c47d47990553b8b35] | committer: Felix Paul Kühne 

freetype: use a sane default font on OS X, so we don't have to add ugly hacks to keep it working

Arial Black is available on all Mac OS X installations current VLC releases can run on and is the default for the 'Quartztext' renderer anyway.

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

 modules/misc/freetype.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 1827420..901497f 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -55,8 +55,8 @@
 #endif
 
 #ifdef __APPLE__
-#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
-#define FC_DEFAULT_FONT "Lucida Grande"
+#define DEFAULT_FONT "/Library/Fonts/Arial Black.ttf"
+#define FC_DEFAULT_FONT "Arial Black"
 #elif defined( SYS_BEOS )
 #define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
 #define FC_DEFAULT_FONT "Swiss"
@@ -331,19 +331,6 @@ static int Create( vlc_object_t *p_this )
 #ifdef WIN32
         GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
         strcat( psz_fontfile, "\\fonts\\arial.ttf" );
-#elif defined(__APPLE__)
-        SInt32 MacVersion;
-        if (Gestalt(gestaltSystemVersion, &MacVersion) == noErr)
-        {
-            if (MacVersion >= 0x1060)
-            {
-                strcpy( psz_fontfile, "/System/Library/Fonts/LucidaGrande.ttc" );
-            }
-            else
-            {
-                strcpy( psz_fontfile, DEFAULT_FONT );
-            }
-        }
 #else
         msg_Err( p_filter, "user didn't specify a font" );
         goto error;