removed redundant osd.h includes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@866 b3059339-0415-0410-9bf9-f77b7e298cf2

6 files changed, 18 insertions, 12 deletions

diff --git a/libvo/sub.c b/libvo/sub.c
index c21cc32535..07b3c4b5d4 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -7,7 +7,7 @@ font_desc_t* vo_font=NULL;
 unsigned char* vo_osd_text="00:00:00";
 int sub_unicode=0;
 
-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)){
+static 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)){
         int len=strlen(vo_osd_text);
         int j;
         int y=10;
@@ -31,7 +31,7 @@ void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,in
 int vo_osd_progbar_type=-1;
 int vo_osd_progbar_value=100;   // 0..255
 
-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)){
+static 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)){
         int len=strlen(vo_osd_text);
         int i;
         int y=dys/2;
@@ -91,7 +91,7 @@ void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int
 
 subtitle* vo_sub=NULL;
 
-void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
+static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
     int i;
     int y;
     y=dys-(1+vo_sub->lines-1)*vo_font->height-10;
diff --git a/libvo/sub.h b/libvo/sub.h
index 8467cdd9a6..ca4863f6e1 100644
--- a/libvo/sub.h
+++ b/libvo/sub.h
@@ -2,6 +2,14 @@
 #ifndef __MPLAYER_SUB_H
 #define __MPLAYER_SUB_H
 
+#if 0
+
+// disable subtitles:
+static inline 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)){
+}
+
+#else
+
 #include "../subreader.h"
 
 extern font_desc_t* vo_font;
@@ -31,8 +39,9 @@ extern subtitle* vo_sub;
 #define OSD_PB_1 0x13
 
 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));
-extern void vo_draw_text_sub(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(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));
+//extern void vo_draw_text_sub(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(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 
 #endif
+#endif
diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c
index eeff1fb045..b12aad5cab 100644
--- a/libvo/vo_dga.c
+++ b/libvo/vo_dga.c
@@ -23,6 +23,9 @@
  * - works only on x86 architectures
  *
  * $Log$
+ * Revision 1.23  2001/05/24 20:48:45  arpi_esp
+ * removed redundant osd.h includes
+ *
  * Revision 1.22  2001/05/07 19:16:04  acki2
  * - now chooses mode with highest ymax (enables doublebuffering in some cases
  *   it didn't work before)
@@ -325,8 +328,6 @@ void vd_printf( int level, const char *str, ...){
 
 //---------------------------------------------------------
 
-#include "osd.h"
-
 static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){
 
   char *d;
diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c
index 123546293b..5813b393c3 100644
--- a/libvo/vo_fbdev.c
+++ b/libvo/vo_fbdev.c
@@ -25,7 +25,6 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "osd.h"
 #include "sub.h"
 #include "yuv2rgb.h"
 extern void rgb15to16_mmx(char *s0, char *d0, int count);
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index c1c06fbcf7..24b44d85b5 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -22,7 +22,6 @@
 #include "mmx.h"
 
 #include "sub.h"
-#include "osd.h"
 
 extern void rgb15to16_mmx(char* s0,char* d0,int count);
 extern int vo_dbpp;
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 6765575d40..5aaee7f9f9 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -394,8 +394,6 @@ static void Display_Image( XImage *myximage,uint8_t *ImageData )
 #endif
 }
 
-#include "osd.h"
-
 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
     switch(bpp){
         case 24: