Only warn if both font family and it's full name are different from requested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26624 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2008-05-01 00:34:29 +00:00
parent 54d3bcce0b
commit 19c9e0aceb
1 changed files with 6 additions and 3 deletions

View File

@ -144,9 +144,12 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold
if (result != FcResultMatch)
goto error;
if (strcasecmp((const char*)val_s, family) != 0)
mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne,
(const char*)val_s, family);
if (strcasecmp((const char*)val_s, family) != 0) {
result = FcPatternGetString(rpat, FC_FULLNAME, 0, &val_s);
if (result != FcResultMatch || strcasecmp((const char*)val_s, family) != 0)
mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne,
(const char*)val_s, family);
}
result = FcPatternGetString(rpat, FC_FILE, 0, &val_s);
if (result != FcResultMatch)