Identifiers should not start with two underscores.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24066 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-08-15 10:34:53 +00:00
parent 2718730d2c
commit 5d9b793edd
4 changed files with 8 additions and 8 deletions

View File

@ -50,7 +50,7 @@ struct osd_text_p {
};
//^
char * __sub_osd_names[]={
char * sub_osd_names[]={
MSGTR_VO_SUB_Seekbar,
MSGTR_VO_SUB_Play,
MSGTR_VO_SUB_Pause,
@ -65,7 +65,7 @@ char * __sub_osd_names[]={
MSGTR_VO_SUB_Hue,
MSGTR_VO_SUB_Balance
};
char * __sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" };
char * sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" };
//static int vo_font_loaded=-1;
font_desc_t* vo_font=NULL;

View File

@ -98,8 +98,8 @@ extern void* vo_vobsub;
#define OSD_PB_1 0x13
/* now in textform */
extern char * __sub_osd_names[];
extern char * __sub_osd_names_short[];
extern char * sub_osd_names[];
extern char * sub_osd_names_short[];
extern int sub_unicode;
extern int sub_utf8;

View File

@ -201,8 +201,8 @@ printosdtext(void)
if (vo_osd_text && vo_osd_text[0] != 0) {
int len;
if(vo_osd_text[0] < 32) {
len = strlen(__sub_osd_names_short[vo_osd_text[0]]) + strlen(vo_osd_text+1) + 2;
aa_printf(c, 0, 0 , aaopt_osdcolor, "%s %s ", __sub_osd_names_short[vo_osd_text[0]], vo_osd_text+1);
len = strlen(sub_osd_names_short[vo_osd_text[0]]) + strlen(vo_osd_text+1) + 2;
aa_printf(c, 0, 0 , aaopt_osdcolor, "%s %s ", sub_osd_names_short[vo_osd_text[0]], vo_osd_text+1);
} else {
len = strlen(vo_osd_text) + 1;
aa_printf(c, 0, 0 , aaopt_osdcolor, "%s ",vo_osd_text);
@ -221,7 +221,7 @@ static void
printosdprogbar(void){
/* print mplayer osd-progbar */
if (vo_osd_progbar_type!=-1){
osdpercent(1,1,0,255,vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type], "");
osdpercent(1,1,0,255,vo_osd_progbar_value, sub_osd_names[vo_osd_progbar_type], "");
}
}
static int

View File

@ -287,7 +287,7 @@ static void draw_osd(void)
{
if (vo_osd_progbar_type != -1)
osdpercent(MESSAGE_DURATION, 0, 255,
vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type],
vo_osd_progbar_value, sub_osd_names[vo_osd_progbar_type],
"");
}