[MPlayer-cvslog] r21042 - in trunk/libass: ass.c ass_bitmap.c ass_cache.c ass_fontconfig.c ass_render.c ass_utils.c mputils.h

[eugeni]

Author: eugeni
Date: Sun Nov 19 01:41:00 2006
New Revision: 21042

Added:
   trunk/libass/mputils.h
Modified:
   trunk/libass/ass.c
   trunk/libass/ass_bitmap.c
   trunk/libass/ass_cache.c
   trunk/libass/ass_fontconfig.c
   trunk/libass/ass_render.c
   trunk/libass/ass_utils.c

Log:
Collect all includes of mplayer headers in libass in a single file (mputils.h).


Modified: trunk/libass/ass.c
==============================================================================
--- trunk/libass/ass.c	(original)
+++ trunk/libass/ass.c	Sun Nov 19 01:41:00 2006
@@ -30,19 +30,14 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#ifdef HAVE_ENCA
-#include "subreader.h" // for guess_buffer_cp
-#endif
-
 #ifdef USE_ICONV
 #include <iconv.h>
 #endif
 
-#include "mp_msg.h"
 #include "ass.h"
 #include "ass_utils.h"
 #include "ass_library.h"
-#include "libvo/sub.h" // for utf8_get_char
+#include "mputils.h"
 
 typedef enum {PST_UNKNOWN = 0, PST_INFO, PST_STYLES, PST_EVENTS, PST_FONTS} parser_state_t;
 

Modified: trunk/libass/ass_bitmap.c
==============================================================================
--- trunk/libass/ass_bitmap.c	(original)
+++ trunk/libass/ass_bitmap.c	Sun Nov 19 01:41:00 2006
@@ -25,8 +25,7 @@
 #include <ft2build.h>
 #include FT_GLYPH_H
 
-#include "mp_msg.h"
-#include "libvo/font_load.h" // for blur()
+#include "mputils.h"
 #include "ass_bitmap.h"
 
 struct ass_synth_priv_s {

Modified: trunk/libass/ass_cache.c
==============================================================================
--- trunk/libass/ass_cache.c	(original)
+++ trunk/libass/ass_cache.c	Sun Nov 19 01:41:00 2006
@@ -26,7 +26,7 @@
 
 #include <assert.h>
 
-#include "mp_msg.h"
+#include "mputils.h"
 #include "ass_fontconfig.h"
 #include "ass_bitmap.h"
 #include "ass_cache.h"

Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	(original)
+++ trunk/libass/ass_fontconfig.c	Sun Nov 19 01:41:00 2006
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "mp_msg.h"
+#include "mputils.h"
 #include "ass_fontconfig.h"
 
 #ifdef HAVE_FONTCONFIG

Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	(original)
+++ trunk/libass/ass_render.c	Sun Nov 19 01:41:00 2006
@@ -29,7 +29,7 @@
 #include FT_GLYPH_H
 #include FT_SYNTHESIS_H
 
-#include "mp_msg.h"
+#include "mputils.h"
 
 #include "ass.h"
 #include "ass_bitmap.h"
@@ -38,9 +38,6 @@
 #include "ass_fontconfig.h"
 #include "ass_library.h"
 
-#include "libvo/sub.h" // for utf8_get_char
-#include "libavutil/common.h"
-
 #define MAX_GLYPHS 1000
 #define MAX_LINES 100
 

Modified: trunk/libass/ass_utils.c
==============================================================================
--- trunk/libass/ass_utils.c	(original)
+++ trunk/libass/ass_utils.c	Sun Nov 19 01:41:00 2006
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "mp_msg.h"
+#include "mputils.h"
 #include "ass_utils.h"
 
 int mystrtoi(char** p, int base, int* res)

Added: trunk/libass/mputils.h
==============================================================================
--- (empty file)
+++ trunk/libass/mputils.h	Sun Nov 19 01:41:00 2006
@@ -0,0 +1,10 @@
+#ifndef __ASS_MPUTILS_H__
+#define __ASS_MPUTILS_H__
+
+#include "mp_msg.h"
+#include "libvo/font_load.h" // for blur()
+#include "subreader.h" // for guess_buffer_cp
+#include "libvo/sub.h" // for utf8_get_char
+#include "libavutil/common.h"
+
+#endif