[MPlayer-cvslog] r21295 - in trunk/libass: ass_cache.c ass_font.c ass_fontconfig.c ass_render.c

[eugeni]

Author: eugeni
Date: Sun Nov 26 23:53:52 2006
New Revision: 21295

Modified:
   trunk/libass/ass_cache.c
   trunk/libass/ass_font.c
   trunk/libass/ass_fontconfig.c
   trunk/libass/ass_render.c

Log:
Remove obsolete "no_more_font_messages" hack.


Modified: trunk/libass/ass_cache.c
==============================================================================
--- trunk/libass/ass_cache.c	(original)
+++ trunk/libass/ass_cache.c	Sun Nov 26 23:53:52 2006
@@ -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;

Modified: trunk/libass/ass_font.c
==============================================================================
--- trunk/libass/ass_font.c	(original)
+++ trunk/libass/ass_font.c	Sun Nov 26 23:53:52 2006
@@ -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 @@
 	
 	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;
 	}
 

Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	(original)
+++ trunk/libass/ass_fontconfig.c	Sun Nov 26 23:53:52 2006
@@ -43,8 +43,6 @@
 	int index_default;
 };
 
-extern int no_more_font_messages;
-
 #ifdef HAVE_FONTCONFIG
 /**
  * \brief Low-level font selection.
@@ -127,20 +125,19 @@
 		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);
 	}

Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Sun Nov 26 23:53:52 2006
@@ -72,8 +72,6 @@
 	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