From: eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 5 Nov 2006 18:56:31 +0000 (+0000)
Subject: Initialize fontconfig in VFCTRL_INIT_EOSD handler.
X-Git-Tag: 0.9.7~396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2ab5ea8df5f2cb37cb2ec2f16d7d52e3cc1fb6e;p=libass

Initialize fontconfig in VFCTRL_INIT_EOSD handler.

Recent libass api changes moved fontconfig initialization to filter's
config() function. It is bad, because cache update can take a long time,
resulting in unpleasant sound effects. This change restores the original
behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20722 b3059339-0415-0410-9bf9-f77b7e298cf2
---

diff --git a/libass/ass_mp.c b/libass/ass_mp.c
index 87e3123..a4d195f 100644
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -211,12 +211,14 @@ ass_track_t* ass_read_subdata(ass_library_t* library, sub_data* subdata, double
 char *get_path(char *);
 
 void ass_configure(ass_renderer_t* priv, int w, int h) {
-	char *dir, *path, *family;
 	ass_set_frame_size(priv, w, h);
 	ass_set_margins(priv, ass_top_margin, ass_bottom_margin, 0, 0);
 	ass_set_use_margins(priv, ass_use_margins);
 	ass_set_font_scale(priv, ass_font_scale);
+}
 
+void ass_configure_fonts(ass_renderer_t* priv) {
+	char *dir, *path, *family;
 	dir = get_path("fonts");
 	if (!font_fontconfig && font_name) path = strdup(font_name);
 	else path = get_path("subfont.ttf");
diff --git a/libass/ass_mp.h b/libass/ass_mp.h
index abe67a9..28c83b6 100644
--- a/libass/ass_mp.h
+++ b/libass/ass_mp.h
@@ -41,6 +41,7 @@ int ass_process_subtitle(ass_track_t* track, subtitle* sub);
 ass_track_t* ass_read_subdata(ass_library_t* library, sub_data* subdata, double fps);
 
 void ass_configure(ass_renderer_t* priv, int w, int h);
+void ass_configure_fonts(ass_renderer_t* priv);
 ass_library_t* ass_init();
 
 #endif