github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-05 03:06:28 +01:00
Code Releases Activity

move errors and a warning to help_mp-en.h

Browse Source 
so they can be translated.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24892 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
compn 2007-10-30 13:15:41 +00:00
parent 4e39ea3dfe
commit 82eef16f4d
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
help/help_mp-en.h
View File

@ -1767,6 +1767,17 @@ static char help_text[]=
#define MSGTR_LIBVO_DXR3_XCorrection "[VO_DXR3] Xcorrection: %d.\n"
#define MSGTR_LIBVO_DXR3_FailedSetSignalMix "[VO_DXR3] Failed to set signal mix!\n"
// libvo/font_load_ft.c
#define MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed "New_Memory_Face failed..\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed "subtitle font: load_sub_face failed.\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed "subtitle font: prepare_charset failed.\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareSubtitleFont "Cannot prepare subtitle font.\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareOSDFont "Cannot prepare OSD font.\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_CannotGenerateTables "Cannot generate tables.\n"
#define MSGTR_LIBVO_FONT_LOAD_FT_DoneFreeTypeFailed "FT_Done_FreeType failed.\n"
// libvo/vo_mga.c
#define MSGTR_LIBVO_MGA_AspectResized "[VO_MGA] aspect(): resized to %dx%d.\n"

17
libvo/font_load_ft.c
View File

@ -32,6 +32,7 @@
#include "mpbswap.h"
#include "font_load.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "mplayer.h"
#include "get_path.h"
#include "osd_font.h"
@ -904,7 +905,7 @@ static int load_sub_face(const char *name, FT_Face *face)
if (err) {
err = FT_New_Face(library, MPLAYER_DATADIR "/subfont.ttf", 0, face);
if (err) {
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" );
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed);
return -1;
}
}
@ -915,7 +916,7 @@ static int load_sub_face(const char *name, FT_Face *face)
static int load_osd_face(FT_Face *face)
{
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");
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed);
return -1;
}
return 0;
@ -1002,7 +1003,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
/* generate the subtitle font */
err = load_sub_face(fname, &face);
if (err) {
mp_msg(MSGT_OSD, MSGL_WARN, "subtitle font: load_sub_face failed.\n");
mp_msg(MSGT_OSD, MSGL_WARN, MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed);
goto gen_osd;
}
desc->face_cnt++;
@ -1019,7 +1020,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
}
if (charset_size < 0) {
mp_msg(MSGT_OSD, MSGL_ERR, "subtitle font: prepare_charset failed.\n");
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed);
goto err_out;
}
#else
@ -1033,7 +1034,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
subtitle_font_thickness, subtitle_font_radius);
if (err) {
mp_msg(MSGT_OSD, MSGL_ERR, "Cannot prepare subtitle font.\n");
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareSubtitleFont);
goto err_out;
}
@ -1051,14 +1052,14 @@ gen_osd:
subtitle_font_thickness, subtitle_font_radius);
if (err) {
mp_msg(MSGT_OSD, MSGL_ERR, "Cannot prepare OSD font.\n");
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareOSDFont);
goto err_out;
}
err = generate_tables(desc, subtitle_font_thickness, subtitle_font_radius);
if (err) {
mp_msg(MSGT_OSD, MSGL_ERR, "Cannot generate tables.\n");
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_CannotGenerateTables);
goto err_out;
}
@ -1113,7 +1114,7 @@ int done_freetype(void)
err = FT_Done_FreeType(library);
if (err) {
mp_msg(MSGT_OSD, MSGL_ERR, "FT_Done_FreeType failed.\n");
mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_DoneFreeTypeFailed);
return -1;
}