Mercurial > mplayer.hg

changeset 24046:7e2808fb1807

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Identifiers should not start with two underscores.
author diego
date Wed, 15 Aug 2007 10:34:53 +0000
parents 57f547f4ed89
children de28f9e8cb00
files libvo/sub.c libvo/sub.h libvo/vo_aa.c libvo/vo_caca.c
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/sub.c	Wed Aug 15 09:34:53 2007 +0000
+++ b/libvo/sub.c	Wed Aug 15 10:34:53 2007 +0000
@@ -50,7 +50,7 @@
 };
 //^
 
-char * __sub_osd_names[]={
+char * sub_osd_names[]={
     MSGTR_VO_SUB_Seekbar,
     MSGTR_VO_SUB_Play,
     MSGTR_VO_SUB_Pause,
@@ -65,7 +65,7 @@
     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;
--- a/libvo/sub.h	Wed Aug 15 09:34:53 2007 +0000
+++ b/libvo/sub.h	Wed Aug 15 10:34:53 2007 +0000
@@ -98,8 +98,8 @@
 #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;
--- a/libvo/vo_aa.c	Wed Aug 15 09:34:53 2007 +0000
+++ b/libvo/vo_aa.c	Wed Aug 15 10:34:53 2007 +0000
@@ -201,8 +201,8 @@
   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 @@
 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
--- a/libvo/vo_caca.c	Wed Aug 15 09:34:53 2007 +0000
+++ b/libvo/vo_caca.c	Wed Aug 15 10:34:53 2007 +0000
@@ -287,7 +287,7 @@
 {
     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],
 		  "");
 }