mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 00:02:13 +00:00
Remove obsolete "no_more_font_messages" hack.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21295 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1bb692d699
commit
b11cd1d856
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user