RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg". 

Arpi: feel free to change... ASAP :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8618 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2002-12-28 15:03:23 +00:00
parent ff7fea6500
commit 64c7077884
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOCS/mplayer.1
View File

@ -847,12 +847,12 @@ Selects Hungarian and falls back to English if Hungarian is not available.
.B \-sub <subtitle\ file> .B \-sub <subtitle\ file>
Use/\:display this subtitle file. Use/\:display this subtitle file.
.TP .TP
.B \-sub-bkg-alpha <0\-255> .B \-sub-bg-alpha <0\-255>
Specify the alpha channel value for subtitles and OSD backgrounds. Specify the alpha channel value for subtitles and OSD backgrounds.
Big values means more transparent. Big values means more transparent.
The 0 value is an exception and means completly transparent. The 0 value is an exception and means completly transparent.
.TP .TP
.B \-sub-bkg-color <0\-255> .B \-sub-bg-color <0\-255>
Specify the color value for subtitles and OSD backgrounds. Specify the color value for subtitles and OSD backgrounds.
Currently subtitles are grayscale so this value is equivalente to the Currently subtitles are grayscale so this value is equivalente to the
intensity of the color. intensity of the color.

4
cfg-common.h
View File

@ -181,8 +181,8 @@
// enable Closed Captioning display // enable Closed Captioning display
{"subcc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"subcc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nooverlapsub", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"nooverlapsub", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"sub-bkg-color", &sub_bkg_color, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, {"sub-bg-color", &sub_bg_color, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
{"sub-bkg-alpha", &sub_bkg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, {"sub-bg-alpha", &sub_bg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, 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},

8
libvo/sub.c
View File

@ -40,8 +40,8 @@ int sub_pos=100;
int sub_width_p=100; int sub_width_p=100;
int sub_alignment=0; /* 0=top, 1=center, 2=bottom */ int sub_alignment=0; /* 0=top, 1=center, 2=bottom */
int sub_visibility=1; int sub_visibility=1;
int sub_bkg_color=0; /* subtitles background color */ int sub_bg_color=0; /* subtitles background color */
int sub_bkg_alpha=0; int sub_bg_alpha=0;
// return the real height of a char: // return the real height of a char:
static inline int get_height(int c,int h){ static inline int get_height(int c,int h){
@ -99,8 +99,8 @@ static void alloc_buf(mp_osd_obj_t* obj)
obj->bitmap_buffer = (unsigned char *)memalign(16, len); obj->bitmap_buffer = (unsigned char *)memalign(16, len);
obj->alpha_buffer = (unsigned char *)memalign(16, len); obj->alpha_buffer = (unsigned char *)memalign(16, len);
} }
memset(obj->bitmap_buffer, sub_bkg_color, len); memset(obj->bitmap_buffer, sub_bg_color, len);
memset(obj->alpha_buffer, sub_bkg_alpha, len); memset(obj->alpha_buffer, sub_bg_alpha, len);
} }
// renders the buffer // renders the buffer

4
libvo/sub.h
View File

@ -101,8 +101,8 @@ extern int sub_width_p;
extern int sub_alignment; extern int sub_alignment;
extern int sub_visibility; extern int sub_visibility;
extern int suboverlap_enabled; extern int suboverlap_enabled;
extern int sub_bkg_color; /* subtitles background color */ extern int sub_bg_color; /* subtitles background color */
extern int sub_bkg_alpha; extern int sub_bg_alpha;
//extern 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)); //extern 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));
//extern void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); //extern void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));