diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-16 11:13:24 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-16 11:13:24 +0000 |
| commit | 4658f123bec812f77c7e8deed6b5457dd0afe04c (patch) | |
| tree | 6e1ce1e69903a1057ecebbae6c8812ee278ab8ca /libass | |
| parent | 3f6d9bb8444940d74495845957fddf6a2627b2bc (diff) | |
| download | libass-4658f123bec812f77c7e8deed6b5457dd0afe04c.tar.bz2 libass-4658f123bec812f77c7e8deed6b5457dd0afe04c.tar.xz | |
make libass use sub_font_name whenever it's possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25420 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_mp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 70e8e7a..a00f0ca 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -59,6 +59,7 @@ extern int font_fontconfig; static int font_fontconfig = -1; #endif extern char* font_name; +extern char* sub_font_name; extern float text_font_scale_factor; extern int subtitle_autoscale; @@ -90,7 +91,7 @@ ass_track_t* ass_default_track(ass_library_t* library) { sid = ass_alloc_style(track); style = track->styles + sid; style->Name = strdup("Default"); - style->FontName = (font_fontconfig >= 0 && font_name) ? strdup(font_name) : strdup("Sans"); + style->FontName = (font_fontconfig >= 0 && sub_font_name) ? strdup(sub_font_name) : (font_fontconfig >= 0 && font_name) ? strdup(font_name) : strdup("Sans"); fs = track->PlayResY * text_font_scale_factor / 100.; // approximate autoscale coefficients @@ -234,9 +235,11 @@ void ass_configure(ass_renderer_t* priv, int w, int h, int unscaled) { void ass_configure_fonts(ass_renderer_t* priv) { char *dir, *path, *family; dir = get_path("fonts"); - if (font_fontconfig < 0 && font_name) path = strdup(font_name); + if (font_fontconfig < 0 && sub_font_name) path = strdup(sub_font_name); + else if (font_fontconfig < 0 && font_name) path = strdup(font_name); else path = get_path("subfont.ttf"); - if (font_fontconfig >= 0 && font_name) family = strdup(font_name); + if (font_fontconfig >= 0 && sub_font_name) family = strdup(sub_font_name); + else if (font_fontconfig >= 0 && font_name) family = strdup(font_name); else family = 0; ass_set_fonts(priv, path, family); |