[Mplayer-cvslog] CVS: main/libvo sub.c,1.35,1.36 sub.h,1.7,1.8 vo_aa.c,1.13,1.14

[Nick Kurshev]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv12655/main/libvo

Modified Files:
	sub.c sub.h vo_aa.c 
Log Message:
never declare variables in *.h files, pls

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sub.c	15 Oct 2001 08:16:54 -0000	1.35
+++ sub.c	27 Oct 2001 14:30:43 -0000	1.36
@@ -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;
 

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sub.h	18 Sep 2001 14:19:33 -0000	1.7
+++ sub.h	27 Oct 2001 14:30:43 -0000	1.8
@@ -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));

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vo_aa.c	17 Aug 2001 20:34:58 -0000	1.13
+++ vo_aa.c	27 Oct 2001 14:30:43 -0000	1.14
@@ -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