[Mplayer-cvslog] CVS: main/libvo sub.c,1.10,1.11 sub.h,1.3,1.4 vo_dga.c,1.22,1.23 vo_fbdev.c,1.40,1.41 vo_svga.c,1.27,1.28 vo_x11.c,1.19,1.20

[GEREOFFY]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv20973

Modified Files:
	sub.c sub.h vo_dga.c vo_fbdev.c vo_svga.c vo_x11.c 
Log Message:
removed redundant osd.h includes

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** sub.c	2001/05/14 23:38:18	1.10
--- sub.c	2001/05/24 20:48:45	1.11
***************
*** 8,12 ****
  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)){
          int len=strlen(vo_osd_text);
          int j;
--- 8,12 ----
  int sub_unicode=0;
  
! 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;
***************
*** 32,36 ****
  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)){
          int len=strlen(vo_osd_text);
          int i;
--- 32,36 ----
  int vo_osd_progbar_value=100;   // 0..255
  
! 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;
***************
*** 92,96 ****
  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)){
      int i;
      int y;
--- 92,96 ----
  subtitle* vo_sub=NULL;
  
! 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;

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sub.h	2001/04/24 11:42:04	1.3
--- sub.h	2001/05/24 20:48:45	1.4
***************
*** 3,6 ****
--- 3,14 ----
  #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"
  
***************
*** 32,38 ****
  
  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));
  
  #endif
--- 40,47 ----
  
  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));
  
+ #endif
  #endif

Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** vo_dga.c	2001/05/07 19:16:04	1.22
--- vo_dga.c	2001/05/24 20:48:45	1.23
***************
*** 24,27 ****
--- 24,30 ----
   *
   * $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
***************
*** 325,330 ****
  
  //---------------------------------------------------------
- 
- #include "osd.h"
  
  static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){
--- 328,331 ----

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** vo_fbdev.c	2001/05/14 22:40:08	1.40
--- vo_fbdev.c	2001/05/24 20:48:45	1.41
***************
*** 26,30 ****
  #include "video_out_internal.h"
  #include "fastmemcpy.h"
- #include "osd.h"
  #include "sub.h"
  #include "yuv2rgb.h"
--- 26,29 ----

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** vo_svga.c	2001/05/06 19:38:57	1.27
--- vo_svga.c	2001/05/24 20:48:45	1.28
***************
*** 23,27 ****
  
  #include "sub.h"
- #include "osd.h"
  
  extern void rgb15to16_mmx(char* s0,char* d0,int count);
--- 23,26 ----

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** vo_x11.c	2001/05/12 01:54:05	1.19
--- vo_x11.c	2001/05/24 20:48:45	1.20
***************
*** 395,400 ****
  }
  
- #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){
--- 395,398 ----


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog