diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 14:59:23 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 14:59:23 +0000 |
| commit | c8b0ddfe4e1570b83b815a3c9befced24e4d2875 (patch) | |
| tree | d0e864e177b24d068bea47f15a911d16a252ddc3 /libvo/font_load.h | |
| parent | 7e26b6cc29c1f050f55152f0759cd2db276d107e (diff) | |
| download | mpv-c8b0ddfe4e1570b83b815a3c9befced24e4d2875.tar.bz2 mpv-c8b0ddfe4e1570b83b815a3c9befced24e4d2875.tar.xz | |
these patches let ,,oldstyle'' and freetype subtitle renderers live
together happily. if an oldstyle subtitle (font.desc) is found, it will
be used. otherwise mplayer will choose subfont.ttf, if freetype was
detected during ./configure.
(also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too)
patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/font_load.h')
| -rw-r--r-- | libvo/font_load.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libvo/font_load.h b/libvo/font_load.h index e4d4e83d2c..98517be1da 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -31,6 +31,7 @@ typedef struct { short font[65536]; int start[65536]; // short is not enough for unicode fonts short width[65536]; + int freetype; #ifdef HAVE_FREETYPE int face_cnt; @@ -78,23 +79,22 @@ extern int force_load_font; int init_freetype(); int done_freetype(); -font_desc_t* read_font_desc(char* fname,int movie_width, int movie_height); +font_desc_t* read_font_desc_ft(char* fname,int movie_width, int movie_height); void free_font_desc(font_desc_t *desc); void render_one_glyph(font_desc_t *desc, int c); int kerning(font_desc_t *desc, int prevc, int c); -void load_font(int width, int height); +void load_font_ft(int width, int height); #else -raw_file* load_raw(char *name,int verbose); -font_desc_t* read_font_desc(char* fname,float factor,int verbose); - -static void inline render_one_glyph(font_desc_t *desc, int c) {} -static int inline kerning(font_desc_t *desc, int prevc, int c) { return 0; } -static void inline load_font(int width, int height){} +static void render_one_glyph(font_desc_t *desc, int c) {} +static int kerning(font_desc_t *desc, int prevc, int c) { return 0; } #endif +raw_file* load_raw(char *name,int verbose); +font_desc_t* read_font_desc(char* fname,float factor,int verbose); + #endif /* ! __MPLAYER_FONT_LOAD_H */ |