diff options
author | Grigori Goronzy <greg@chown.ath.cx> | 2015-09-07 11:40:54 +0200 |
---|---|---|
committer | Grigori Goronzy <greg@chown.ath.cx> | 2015-09-07 11:40:54 +0200 |
commit | a2f12d6f79bfdc6bc7c1cb6ddd3a42c97ab2de4f (patch) | |
tree | 2600406db3d71a17d4389f34ba4bf66f7c098247 /libass/ass_render_api.c | |
parent | 23de9995103c16ceceba19cae87e328be12fa8e4 (diff) | |
parent | 0268c64b8ec7bef9287a212759152bf7d15e64d8 (diff) | |
download | libass-a2f12d6f79bfdc6bc7c1cb6ddd3a42c97ab2de4f.tar.bz2 libass-a2f12d6f79bfdc6bc7c1cb6ddd3a42c97ab2de4f.tar.xz |
Merge branch 'fonts'
Diffstat (limited to 'libass/ass_render_api.c')
-rw-r--r-- | libass/ass_render_api.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libass/ass_render_api.c b/libass/ass_render_api.c index 2db653a6..975cd637 100644 --- a/libass/ass_render_api.c +++ b/libass/ass_render_api.c @@ -135,8 +135,8 @@ void ass_set_line_position(ASS_Renderer *priv, double line_position) } void ass_set_fonts(ASS_Renderer *priv, const char *default_font, - const char *default_family, int fc, const char *config, - int update) + const char *default_family, int dfp, + const char *config, int update) { free(priv->settings.default_font); free(priv->settings.default_family); @@ -144,11 +144,12 @@ void ass_set_fonts(ASS_Renderer *priv, const char *default_font, priv->settings.default_family = default_family ? strdup(default_family) : 0; - if (priv->fontconfig_priv) - fontconfig_done(priv->fontconfig_priv); - priv->fontconfig_priv = - fontconfig_init(priv->library, priv->ftlibrary, default_family, - default_font, fc, config, update); + ass_reconfigure(priv); + + if (priv->fontselect) + ass_fontselect_free(priv->fontselect); + priv->fontselect = ass_fontselect_init(priv->library, priv->ftlibrary, + default_family, default_font, config, dfp); } void ass_set_selective_style_override_enabled(ASS_Renderer *priv, int bits) @@ -169,7 +170,8 @@ void ass_set_selective_style_override(ASS_Renderer *priv, ASS_Style *style) int ass_fonts_update(ASS_Renderer *render_priv) { - return fontconfig_update(render_priv->fontconfig_priv); + // This is just a stub now! + return 1; } void ass_set_cache_limits(ASS_Renderer *render_priv, int glyph_max, @@ -179,3 +181,10 @@ void ass_set_cache_limits(ASS_Renderer *render_priv, int glyph_max, render_priv->cache.bitmap_max_size = bitmap_max ? 1048576 * bitmap_max : BITMAP_CACHE_MAX_SIZE; } + +ASS_FontProvider * +ass_create_font_provider(ASS_Renderer *priv, ASS_FontProviderFuncs *funcs, + void *data) +{ + return ass_font_provider_new(priv->fontselect, funcs, data); +} |