Commit f27861f1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Libass: simplify and do not call ass_set_fonts_dir

This should continue to fix the fontconfig caching bugs
(cherry picked from commit 1402fd523e1e8b50b8ec669019f7f607d5f6594b)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 48c27eb0
......@@ -698,42 +698,11 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
}
free( pp_attachments );
char *psz_font_dir = NULL;
#if defined(WIN32)
dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_dec,
_("Building font cache"),
_( "Please wait while your font cache is rebuilt.\n"
"This should take less than a minute." ), NULL );
/* This makes Windows build of VLC hang */
const UINT uPath = GetSystemWindowsDirectoryW( NULL, 0 );
if( uPath > 0 )
{
wchar_t *psw_path = calloc( uPath + 1, sizeof(wchar_t) );
if( psw_path )
{
if( GetSystemWindowsDirectoryW( psw_path, uPath + 1 ) > 0 )
{
char *psz_tmp = FromWide( psw_path );
if( psz_tmp &&
asprintf( &psz_font_dir, "%s\\Fonts", psz_tmp ) < 0 )
psz_font_dir = NULL;
free( psz_tmp );
}
free( psw_path );
}
}
#endif
if( !psz_font_dir )
psz_font_dir = config_GetUserDir( VLC_CACHE_DIR );
if( !psz_font_dir )
goto error;
msg_Dbg( p_dec, "Setting libass fontdir: %s", psz_font_dir );
ass_set_fonts_dir( p_library, psz_font_dir );
free( psz_font_dir );
#ifdef WIN32
if( p_dialog )
dialog_ProgressSet( p_dialog, NULL, 0.1 );
#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