mirror of https://github.com/mpv-player/mpv
Collect all includes of mplayer headers in libass in a single file (mputils.h).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21042 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
01f4fe7b15
commit
8856d67d40
|
@ -30,19 +30,14 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
#ifdef HAVE_ENCA
|
|
||||||
#include "subreader.h" // for guess_buffer_cp
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_ICONV
|
#ifdef USE_ICONV
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mp_msg.h"
|
|
||||||
#include "ass.h"
|
#include "ass.h"
|
||||||
#include "ass_utils.h"
|
#include "ass_utils.h"
|
||||||
#include "ass_library.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;
|
typedef enum {PST_UNKNOWN = 0, PST_INFO, PST_STYLES, PST_EVENTS, PST_FONTS} parser_state_t;
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,7 @@
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
#include FT_GLYPH_H
|
#include FT_GLYPH_H
|
||||||
|
|
||||||
#include "mp_msg.h"
|
#include "mputils.h"
|
||||||
#include "libvo/font_load.h" // for blur()
|
|
||||||
#include "ass_bitmap.h"
|
#include "ass_bitmap.h"
|
||||||
|
|
||||||
struct ass_synth_priv_s {
|
struct ass_synth_priv_s {
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "mp_msg.h"
|
#include "mputils.h"
|
||||||
#include "ass_fontconfig.h"
|
#include "ass_fontconfig.h"
|
||||||
#include "ass_bitmap.h"
|
#include "ass_bitmap.h"
|
||||||
#include "ass_cache.h"
|
#include "ass_cache.h"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include "mp_msg.h"
|
#include "mputils.h"
|
||||||
#include "ass_fontconfig.h"
|
#include "ass_fontconfig.h"
|
||||||
|
|
||||||
#ifdef HAVE_FONTCONFIG
|
#ifdef HAVE_FONTCONFIG
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include FT_GLYPH_H
|
#include FT_GLYPH_H
|
||||||
#include FT_SYNTHESIS_H
|
#include FT_SYNTHESIS_H
|
||||||
|
|
||||||
#include "mp_msg.h"
|
#include "mputils.h"
|
||||||
|
|
||||||
#include "ass.h"
|
#include "ass.h"
|
||||||
#include "ass_bitmap.h"
|
#include "ass_bitmap.h"
|
||||||
|
@ -38,9 +38,6 @@
|
||||||
#include "ass_fontconfig.h"
|
#include "ass_fontconfig.h"
|
||||||
#include "ass_library.h"
|
#include "ass_library.h"
|
||||||
|
|
||||||
#include "libvo/sub.h" // for utf8_get_char
|
|
||||||
#include "libavutil/common.h"
|
|
||||||
|
|
||||||
#define MAX_GLYPHS 1000
|
#define MAX_GLYPHS 1000
|
||||||
#define MAX_LINES 100
|
#define MAX_LINES 100
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#include "mp_msg.h"
|
#include "mputils.h"
|
||||||
#include "ass_utils.h"
|
#include "ass_utils.h"
|
||||||
|
|
||||||
int mystrtoi(char** p, int base, int* res)
|
int mystrtoi(char** p, int base, int* res)
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue