From 888c644420b138875bf5e9f956d926b0be784eae Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 1 Sep 2015 14:08:47 +0200 Subject: fontselect: use designated initializers Tired of matching the names and order of the callbacks in my head. While we're at it, also give some of the callbacks better names. --- libass/ass_fontselect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libass/ass_fontselect.c') diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index 02d0bc4..ab40bd5 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -514,8 +514,9 @@ static char *select_font(ASS_FontSelector *priv, ASS_Library *library, }; // get a list of substitutes if applicable, and use it for matching - if (default_provider && default_provider->funcs.subst_font) { - default_provider->funcs.subst_font(default_provider->priv, family_trim, &meta); + if (default_provider && default_provider->funcs.get_substitutions) { + default_provider->funcs.get_substitutions(default_provider->priv, + family_trim, &meta); } if (!meta.n_fullname) { meta = default_meta; @@ -634,13 +635,13 @@ char *ass_font_select(ASS_FontSelector *priv, ASS_Library *library, family, bold, italic, res, *index, *postscript_name); } - if (!res && default_provider && default_provider->funcs.fallback_font) { + if (!res && default_provider && default_provider->funcs.get_fallback) { ASS_FontProviderMetaData meta; meta.families = &family; meta.weight = bold; meta.slant = italic; meta.width = 100; - char *fallback_family = default_provider->funcs.fallback_font( + char *fallback_family = default_provider->funcs.get_fallback( default_provider->priv, &meta, code); if (fallback_family) { -- cgit v1.2.3