diff options
author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 22:53:52 +0000 |
---|---|---|
committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-26 22:53:52 +0000 |
commit | 4dcceaf3695d1bb2f3dff4e4cd4edc0ff36254e1 (patch) | |
tree | 01de689ca7d6a7fab0b35e639add9090ba258718 /libass | |
parent | 8a9fdef48d4557b4140f61cd06ba922f3bb3804e (diff) | |
download | libass-4dcceaf3695d1bb2f3dff4e4cd4edc0ff36254e1.tar.bz2 libass-4dcceaf3695d1bb2f3dff4e4cd4edc0ff36254e1.tar.xz |
Remove obsolete "no_more_font_messages" hack.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r-- | libass/ass_cache.c | 2 | ||||
-rw-r--r-- | libass/ass_font.c | 6 | ||||
-rw-r--r-- | libass/ass_fontconfig.c | 11 | ||||
-rw-r--r-- | libass/ass_render.c | 2 |
4 files changed, 5 insertions, 16 deletions
diff --git a/libass/ass_cache.c b/libass/ass_cache.c index e3ef630..7100d6c 100644 --- a/libass/ass_cache.c +++ b/libass/ass_cache.c @@ -37,8 +37,6 @@ static ass_font_t* font_cache; static int font_cache_size; -extern int no_more_font_messages; - static int font_compare(ass_font_desc_t* a, ass_font_desc_t* b) { if (strcmp(a->family, b->family) != 0) return 0; diff --git a/libass/ass_font.c b/libass/ass_font.c index 5778935..c89931b 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -30,8 +30,6 @@ #include "ass_fontconfig.h" #include "mputils.h" -extern int no_more_font_messages; - /** * Select Microfost Unicode CharMap, if the font has one. * Otherwise, let FreeType decide. @@ -61,9 +59,7 @@ int ass_font_init(FT_Library ftlibrary, void* fc_priv, ass_font_t* font, ass_fon error = FT_New_Face(ftlibrary, path, index, &face); if (error) { - if (!no_more_font_messages) - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningFont, path, index); - no_more_font_messages = 1; + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningFont, path, index); return 1; } diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index f859a25..b4ac44e 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -43,8 +43,6 @@ struct fc_instance_s { int index_default; }; -extern int no_more_font_messages; - #ifdef HAVE_FONTCONFIG /** * \brief Low-level font selection. @@ -127,20 +125,19 @@ char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, res = _select_font(priv, family, bold, italic, index); if (!res && priv->family_default) { res = _select_font(priv, priv->family_default, bold, italic, index); - if (res && !no_more_font_messages) + if (res) mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFontFamily, family, bold, italic, res, *index); } if (!res && priv->path_default) { res = priv->path_default; *index = priv->index_default; - if (!no_more_font_messages) - mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFont, - family, bold, italic, res, *index); + mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFont, + family, bold, italic, res, *index); } if (!res) { res = _select_font(priv, "Arial", bold, italic, index); - if (res && !no_more_font_messages) + if (res) mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingArialFontFamily, family, bold, italic, res, *index); } diff --git a/libass/ass_render.c b/libass/ass_render.c index 5175219..dc43129 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -72,8 +72,6 @@ struct ass_renderer_s { ass_image_t* images_root; // rendering result is stored here }; -int no_more_font_messages = 0; // don't print font warnings - typedef enum {EF_NONE = 0, EF_KARAOKE, EF_KARAOKE_KF, EF_KARAOKE_KO} effect_t; // describes a glyph |