diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-28 15:03:23 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-28 15:03:23 +0000 |
| commit | 64c707788469809fd572ba24c967dd7e1fc2aed8 (patch) | |
| tree | d6bced1b2eefe6e02512f23c31e2f55609ffe107 | |
| parent | ff7fea6500baf2e9a7586f0f371bef2e59d3b855 (diff) | |
| download | mpv-64c707788469809fd572ba24c967dd7e1fc2aed8.tar.bz2 mpv-64c707788469809fd572ba24c967dd7e1fc2aed8.tar.xz | |
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
| -rw-r--r-- | DOCS/mplayer.1 | 4 | ||||
| -rw-r--r-- | cfg-common.h | 4 | ||||
| -rw-r--r-- | libvo/sub.c | 8 | ||||
| -rw-r--r-- | libvo/sub.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 632d2b2ac8..2c507f6350 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -847,12 +847,12 @@ Selects Hungarian and falls back to English if Hungarian is not available. .B \-sub <subtitle\ file> Use/\:display this subtitle file. .TP -.B \-sub-bkg-alpha <0\-255> +.B \-sub-bg-alpha <0\-255> Specify the alpha channel value for subtitles and OSD backgrounds. Big values means more transparent. The 0 value is an exception and means completly transparent. .TP -.B \-sub-bkg-color <0\-255> +.B \-sub-bg-color <0\-255> Specify the color value for subtitles and OSD backgrounds. Currently subtitles are grayscale so this value is equivalente to the intensity of the color. diff --git a/cfg-common.h b/cfg-common.h index b31841fd46..ab18850df1 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -181,8 +181,8 @@ // enable Closed Captioning display {"subcc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, 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-bkg-alpha", &sub_bkg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, + {"sub-bg-color", &sub_bg_color, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, + {"sub-bg-alpha", &sub_bg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, #endif #ifdef USE_OSD {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL}, diff --git a/libvo/sub.c b/libvo/sub.c index a7a2ec1b7b..fe9385ba93 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -40,8 +40,8 @@ int sub_pos=100; int sub_width_p=100; int sub_alignment=0; /* 0=top, 1=center, 2=bottom */ int sub_visibility=1; -int sub_bkg_color=0; /* subtitles background color */ -int sub_bkg_alpha=0; +int sub_bg_color=0; /* subtitles background color */ +int sub_bg_alpha=0; // return the real height of a char: 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->alpha_buffer = (unsigned char *)memalign(16, len); } - memset(obj->bitmap_buffer, sub_bkg_color, len); - memset(obj->alpha_buffer, sub_bkg_alpha, len); + memset(obj->bitmap_buffer, sub_bg_color, len); + memset(obj->alpha_buffer, sub_bg_alpha, len); } // renders the buffer diff --git a/libvo/sub.h b/libvo/sub.h index 6e69c4c2e1..6868f59723 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -101,8 +101,8 @@ extern int sub_width_p; extern int sub_alignment; extern int sub_visibility; extern int suboverlap_enabled; -extern int sub_bkg_color; /* subtitles background color */ -extern int sub_bkg_alpha; +extern int sub_bg_color; /* subtitles background color */ +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_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); |