[MPlayer-cvslog] r24066 - in trunk/libvo: sub.c sub.h vo_aa.c vo_caca.c

[diego]

Author: diego
Date: Wed Aug 15 12:34:53 2007
New Revision: 24066

Log:
Identifiers should not start with two underscores.


Modified:
   trunk/libvo/sub.c
   trunk/libvo/sub.h
   trunk/libvo/vo_aa.c
   trunk/libvo/vo_caca.c

Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c	(original)
+++ trunk/libvo/sub.c	Wed Aug 15 12:34:53 2007
@@ -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;

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	(original)
+++ trunk/libvo/sub.h	Wed Aug 15 12:34:53 2007
@@ -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;

Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c	(original)
+++ trunk/libvo/vo_aa.c	Wed Aug 15 12:34:53 2007
@@ -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

Modified: trunk/libvo/vo_caca.c
==============================================================================
--- trunk/libvo/vo_caca.c	(original)
+++ trunk/libvo/vo_caca.c	Wed Aug 15 12:34:53 2007
@@ -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],
 		  "");
 }