# HG changeset patch
# User rathann
# Date 1041087803 0
# Node ID 6ffbe760801305ac5bf74c53451defef0a8b0e27
# Parent  4dd84fd2d208b26566b4ed704dc2f5570fbae021
Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg".
Arpi: feel free to change... ASAP :)

diff -r 4dd84fd2d208 -r 6ffbe7608013 DOCS/mplayer.1
--- a/DOCS/mplayer.1	Sat Dec 28 14:56:56 2002 +0000
+++ b/DOCS/mplayer.1	Sat Dec 28 15:03:23 2002 +0000
@@ -847,12 +847,12 @@
 .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 -r 4dd84fd2d208 -r 6ffbe7608013 cfg-common.h
--- a/cfg-common.h	Sat Dec 28 14:56:56 2002 +0000
+++ b/cfg-common.h	Sat Dec 28 15:03:23 2002 +0000
@@ -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 -r 4dd84fd2d208 -r 6ffbe7608013 libvo/sub.c
--- a/libvo/sub.c	Sat Dec 28 14:56:56 2002 +0000
+++ b/libvo/sub.c	Sat Dec 28 15:03:23 2002 +0000
@@ -40,8 +40,8 @@
 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 @@
 	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 -r 4dd84fd2d208 -r 6ffbe7608013 libvo/sub.h
--- a/libvo/sub.h	Sat Dec 28 14:56:56 2002 +0000
+++ b/libvo/sub.h	Sat Dec 28 15:03:23 2002 +0000
@@ -101,8 +101,8 @@
 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));