Commit a7f981fc authored by Felix Paul Kühne's avatar 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.
parent 6a235142
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont" #define DEFAULT_FONT "/Library/Fonts/Arial Black.ttf"
#define FC_DEFAULT_FONT "Lucida Grande" #define FC_DEFAULT_FONT "Arial Black"
#elif defined( SYS_BEOS ) #elif defined( SYS_BEOS )
#define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf" #define DEFAULT_FONT "/boot/beos/etc/fonts/ttfonts/Swiss721.ttf"
#define FC_DEFAULT_FONT "Swiss" #define FC_DEFAULT_FONT "Swiss"
...@@ -331,19 +331,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -331,19 +331,6 @@ static int Create( vlc_object_t *p_this )
#ifdef WIN32 #ifdef WIN32
GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 ); GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
strcat( psz_fontfile, "\\fonts\\arial.ttf" ); 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 #else
msg_Err( p_filter, "user didn't specify a font" ); msg_Err( p_filter, "user didn't specify a font" );
goto error; goto error;
......
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