0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00

subtitle positioning patch by Jiri Svoboda

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4774 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2002-02-20 22:43:34 +00:00
parent d66ad5a63e
commit 8337d9c26f
2 changed files with 4 additions and 1 deletions

View File

@ -57,6 +57,7 @@ extern int sub_utf8;
#ifdef USE_ICONV #ifdef USE_ICONV
extern char *sub_cp; extern char *sub_cp;
#endif #endif
extern int sub_pos;
#endif #endif
#ifdef USE_OSD #ifdef USE_OSD
@ -174,6 +175,7 @@ static config_t mplayer_opts[]={
{"nounicode", &sub_unicode, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"nounicode", &sub_unicode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"utf8", &sub_utf8, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"utf8", &sub_utf8, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noutf8", &sub_utf8, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"noutf8", &sub_utf8, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"subpos",&sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
#endif #endif
#ifdef USE_OSD #ifdef USE_OSD
{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},

View File

@ -27,6 +27,7 @@ font_desc_t* vo_font=NULL;
unsigned char* vo_osd_text=NULL; unsigned char* vo_osd_text=NULL;
int sub_unicode=0; int sub_unicode=0;
int sub_utf8=0; int sub_utf8=0;
int sub_pos=100;
inline static void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ inline static void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
unsigned char *cp=vo_osd_text; unsigned char *cp=vo_osd_text;
@ -252,7 +253,7 @@ inline static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,in
} }
} }
y = memy; if (memy < (dys * sub_pos / 100)) { y = memy; } else { y = dys * sub_pos /100;};
// printf("lines=%d y=%d\n",lines,y); // printf("lines=%d y=%d\n",lines,y);