summaryrefslogtreecommitdiffstats
path: root/libass/ass_fontselect.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-09-01 14:08:47 +0200
committerwm4 <wm4@nowhere>2015-09-01 14:08:47 +0200
commit888c644420b138875bf5e9f956d926b0be784eae (patch)
tree6dd0a1184f3239e4dab7188995061d96da9fd8b0 /libass/ass_fontselect.c
parent72f751e3a5693ed2b7e935cb6c31ce18eed8d7b0 (diff)
downloadlibass-888c644420b138875bf5e9f956d926b0be784eae.tar.bz2
libass-888c644420b138875bf5e9f956d926b0be784eae.tar.xz
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.
Diffstat (limited to 'libass/ass_fontselect.c')
-rw-r--r--libass/ass_fontselect.c9
1 files changed, 5 insertions, 4 deletions
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) {