Commit 3d1adc71 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 a9bb5264
...@@ -54,10 +54,8 @@ ...@@ -54,10 +54,8 @@
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#import <Carbon/Carbon.h> #define DEFAULT_FONT "/Library/Fonts/Arial Black.ttf"
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont" #define FC_DEFAULT_FONT "Arial Black"
#define DEFAULT_FONT_SNOWLEOPARD "/System/Library/Fonts/LucidaGrande.ttc"
#define FC_DEFAULT_FONT "Lucida Grande"
#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"
...@@ -326,14 +324,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -326,14 +324,6 @@ static int Create( vlc_object_t *p_this )
if( !psz_fontfamily || !*psz_fontfamily ) if( !psz_fontfamily || !*psz_fontfamily )
{ {
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
#ifdef __APPLE__
SInt32 MacVersion;
free( psz_fontfamily);
if (Gestalt(gestaltSystemVersion, &MacVersion) == noErr && MacVersion >= 0x1060)
psz_fontfamily=strdup( DEFAULT_FONT_SNOWLEOPARD );
else
psz_fontfamily=strdup( DEFAULT_FONT );
#else
free( psz_fontfamily); free( psz_fontfamily);
psz_fontfamily=strdup( DEFAULT_FONT ); psz_fontfamily=strdup( DEFAULT_FONT );
#endif #endif
...@@ -345,12 +335,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -345,12 +335,6 @@ static int Create( vlc_object_t *p_this )
# ifdef WIN32 # ifdef WIN32
GetWindowsDirectory( psz_fontfamily , PATH_MAX + 1 ); GetWindowsDirectory( psz_fontfamily , PATH_MAX + 1 );
strcat( psz_fontfamily, "\\fonts\\arial.ttf" ); strcat( psz_fontfamily, "\\fonts\\arial.ttf" );
# elif __APPLE__
SInt32 MacVersion;
if (Gestalt(gestaltSystemVersion, &MacVersion) == noErr && MacVersion >= 0x1060)
strcpy( psz_fontfile, DEFAULT_FONT_SNOWLEOPARD );
else
strcpy( psz_fontfile, DEFAULT_FONT );
# else # else
strcpy( psz_fontfamily, DEFAULT_FONT ); strcpy( psz_fontfamily, DEFAULT_FONT );
# endif # endif
......
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