Skip to content

V
vlc-1.1
Commit 4f197fd7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

freetype: simply snowleopard-hack for default font

parent df36b003
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 11 deletions
modules/misc/freetype.c
View file @ 4f197fd7
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#ifdef __APPLE__ #ifdef __APPLE__
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
#define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont" #define DEFAULT_FONT "/System/Library/Fonts/LucidaGrande.dfont"
#define DEFAULT_FONT_SNOWLEOPARD "/System/Library/Fonts/LucidaGrande.ttc"
#define FC_DEFAULT_FONT "Lucida Grande" #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"
...@@ -325,8 +326,17 @@ static int Create( vlc_object_t *p_this ) ...@@ -325,8 +326,17 @@ 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
#else #else
free( psz_fontfamily ); free( psz_fontfamily );
psz_fontfamily = (char *)malloc( PATH_MAX + 1 ); psz_fontfamily = (char *)malloc( PATH_MAX + 1 );
...@@ -337,17 +347,10 @@ static int Create( vlc_object_t *p_this ) ...@@ -337,17 +347,10 @@ static int Create( vlc_object_t *p_this )
strcat( psz_fontfamily, "\\fonts\\arial.ttf" ); strcat( psz_fontfamily, "\\fonts\\arial.ttf" );
# elif __APPLE__ # elif __APPLE__
SInt32 MacVersion; SInt32 MacVersion;
if (Gestalt(gestaltSystemVersion, &MacVersion) == noErr) if (Gestalt(gestaltSystemVersion, &MacVersion) == noErr && MacVersion >= 0x1060)
{ strcpy( psz_fontfile, DEFAULT_FONT_SNOWLEOPARD );
if (MacVersion >= 0x1060) else
{ strcpy( psz_fontfile, DEFAULT_FONT );
strcpy( psz_fontfile, "/System/Library/Fonts/LucidaGrande.ttc" );
}
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