diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-29 17:16:34 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-29 17:16:34 +0000 |
| commit | 6247d6be7a2be84da65a311bd21a19fd84c25362 (patch) | |
| tree | a300a3f782866f163c5144aa24140f906db5dd1d /libvo | |
| parent | 50418843554ae72770f28783aa8d28c350f4300b (diff) | |
| download | mpv-6247d6be7a2be84da65a311bd21a19fd84c25362.tar.bz2 mpv-6247d6be7a2be84da65a311bd21a19fd84c25362.tar.xz | |
- add freetype support for gui
- fix some small bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7140 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/font_load_ft.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 4272809577..16daa60b05 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -856,21 +856,16 @@ void free_font_desc(font_desc_t *desc) static int load_sub_face(char *name, FT_Face *face) { - int err; + int err = -1; - if (name) { - err = FT_New_Face(library, name, 0, face); - } else { - err = 1; - } + if (name) err = FT_New_Face(library, name, 0, face); if (err) { err = FT_New_Face(library, get_path("subfont.ttf"), 0, face); if (err) { err = FT_New_Face(library, DATADIR"/subfont.ttf", 0, face); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "New_Face failed. Maybe the font path is wrong.\n"); - mp_msg(MSGT_OSD, MSGL_ERR, "Please supply the text font file (~/.mplayer/subfont.ttf).\n"); + mp_msg(MSGT_OSD, MSGL_ERR, "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n" ); return -1; } } @@ -880,10 +875,7 @@ static int load_sub_face(char *name, FT_Face *face) static int load_osd_face(FT_Face *face) { - int err; - - err = FT_New_Memory_Face(library, osd_font_pfb, sizeof(osd_font_pfb), 0, face); - if (err) { + if ( FT_New_Memory_Face(library, osd_font_pfb, sizeof(osd_font_pfb), 0, face) ) { mp_msg(MSGT_OSD, MSGL_ERR, "New_Memory_Face failed..\n"); return -1; } @@ -966,7 +958,7 @@ font_desc_t* read_font_desc(char *fname, float factor, int movie_width, int movi /* generate the subtitle font */ err = load_sub_face(fname, &face); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "subtitle font: load_sub_face failed.\n"); + mp_msg(MSGT_OSD, MSGL_WARN, "subtitle font: load_sub_face failed.\n"); goto gen_osd; } |