Mercurial > mplayer.hg

changeset 2498:38bb41c48d1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
never declare variables in *.h files, pls
author nick
date Sat, 27 Oct 2001 14:30:43 +0000
parents ed74af5ee66d
children 13e4620eccb7
files libvo/sub.c libvo/sub.h libvo/vo_aa.c
diffstat 3 files changed, 21 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/sub.c	Sat Oct 27 13:53:01 2001 +0000
+++ b/libvo/sub.c	Sat Oct 27 14:30:43 2001 +0000
@@ -1,6 +1,23 @@
 
 #include "sub.h"
 
+
+char * __sub_osd_names[]={
+    "Seekbar",
+    "Play",
+    "Pause",
+    "Stop",
+    "Rewind",
+    "Forward",
+    "Clock",
+    "Contrast",
+    "Saturation",
+    "Volume",
+    "Brightness",
+    "Hue"
+};
+char * __sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", ""};
+
 //static int vo_font_loaded=-1;
 font_desc_t* vo_font=NULL;
 
--- a/libvo/sub.h	Sat Oct 27 13:53:01 2001 +0000
+++ b/libvo/sub.h	Sat Oct 27 14:30:43 2001 +0000
@@ -39,23 +39,8 @@
 #define OSD_PB_1 0x13
 
 /* now in textform */
-static char * osd_names[]={
-    "Seekbar",
-    "Play",
-    "Pause",
-    "Stop",
-    "Rewind",
-    "Forward",
-    "Clock",
-    "Contrast",
-    "Saturation",
-    "Volume",
-    "Brightness",
-    "Hue"
-};
-static char * osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", ""};
-    
-
+extern char * __sub_osd_names[];
+extern char * __sub_osd_names_short[];
 
 //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));
--- a/libvo/vo_aa.c	Sat Oct 27 13:53:01 2001 +0000
+++ b/libvo/vo_aa.c	Sat Oct 27 14:30:43 2001 +0000
@@ -194,14 +194,14 @@
      * places the mplayer status osd
      */
     if (vo_osd_text)
-	aa_printf(c, 0, 0 , aaopt_osdcolor, "%s %s ", osd_names_short[vo_osd_text[0]], vo_osd_text+1);
+	aa_printf(c, 0, 0 , aaopt_osdcolor, "%s %s ", __sub_osd_names_short[vo_osd_text[0]], vo_osd_text+1);
 }
 
 void
 printosdprogbar(){
     /* print mplayer osd-progbar */
     if (vo_osd_progbar_type!=-1){
-	osdpercent(1,1,0,255,vo_osd_progbar_value, osd_names[vo_osd_progbar_type], "");	
+	osdpercent(1,1,0,255,vo_osd_progbar_value, __sub_osd_names[vo_osd_progbar_type], "");	
     }
 }
 static uint32_t