diff options
| -rw-r--r-- | libvo/sub.c | 4 | ||||
| -rw-r--r-- | libvo/sub.h | 4 | ||||
| -rw-r--r-- | libvo/vo_aa.c | 6 | ||||
| -rw-r--r-- | libvo/vo_caca.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 3deadce98d..c882759bf9 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -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; diff --git a/libvo/sub.h b/libvo/sub.h index feb3354679..fcfdd71a88 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -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; diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index bac7eac8e1..34a5b91a6e 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -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 diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index f09cf54e33..d5dc3e7ffb 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -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], ""); } |