Skip to content

V
vlc
Commit 30819e5d authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

libass: remove legacy code for Apple platforms

parent 9982a160
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/codec/libass.c
View file @ 30819e5d
...@@ -219,7 +219,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -219,7 +219,7 @@ static int Create( vlc_object_t *p_this )
#endif #endif
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32)
dialog_progress_bar_t *p_dialog = dialog_progress_bar_t *p_dialog =
dialog_ProgressCreate( p_dec, dialog_ProgressCreate( p_dec,
_("Building font cache"), _("Building font cache"),
...@@ -227,7 +227,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -227,7 +227,7 @@ static int Create( vlc_object_t *p_this )
"This should take less than a minute." ), NULL ); "This should take less than a minute." ), NULL );
#endif #endif
ass_set_fonts( p_renderer, psz_font, psz_family, 1, NULL, 1 ); // setup default font/family ass_set_fonts( p_renderer, psz_font, psz_family, 1, NULL, 1 ); // setup default font/family
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32)
if( p_dialog ) if( p_dialog )
{ {
dialog_ProgressSet( p_dialog, NULL, 1.0 ); dialog_ProgressSet( p_dialog, NULL, 1.0 );
...@@ -235,7 +235,6 @@ static int Create( vlc_object_t *p_this ) ...@@ -235,7 +235,6 @@ static int Create( vlc_object_t *p_this )
} }
#endif #endif
#else #else
/* FIXME you HAVE to give him a font if no fontconfig */
ass_set_fonts( p_renderer, psz_font, psz_family, 1, NULL, 1 ); ass_set_fonts( p_renderer, psz_font, psz_family, 1, NULL, 1 );
#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