[Mplayer-cvslog] CVS: main/libvo sub.c,1.5,1.6 sub.h,1.2,1.3 vo_mga.c,1.11,1.12 vo_xmga.c,1.17,1.18 vo_xv.c,1.16,1.17 vo_sdl.c,1.24,1.25 vo_svga.c,1.22,1.23 vo_x11.c,1.16,1.17 vo_fbdev.c,1.33,1.34 vo_dga.c,1.16,1.17 video_out_internal.h,1.3,1.4
Zoltan Ponekker
pontscho at users.sourceforge.net
Tue Apr 24 13:42:06 CEST 2001
Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv10748/libvo
Modified Files:
sub.c sub.h vo_mga.c vo_xmga.c vo_xv.c vo_sdl.c vo_svga.c
vo_x11.c vo_fbdev.c vo_dga.c video_out_internal.h
Log Message:
clean up
Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** sub.c 2001/04/12 00:41:22 1.5
--- sub.c 2001/04/24 11:42:04 1.6
***************
*** 1,4 ****
- #include "subreader.h"
#include "sub.h"
--- 1,3 ----
***************
*** 89,93 ****
}
-
subtitle* vo_sub=NULL;
--- 88,91 ----
Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** sub.h 2001/03/30 03:01:50 1.2
--- sub.h 2001/04/24 11:42:04 1.3
***************
*** 1,3 ****
--- 1,8 ----
+ #ifndef __MPLAYER_SUB_H
+ #define __MPLAYER_SUB_H
+
+ #include "../subreader.h"
+
extern font_desc_t* vo_font;
***************
*** 26,28 ****
--- 31,38 ----
#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));
+ #endif
Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** vo_mga.c 2001/04/24 11:30:57 1.11
--- vo_mga.c 2001/04/24 11:42:04 1.12
***************
*** 41,44 ****
--- 41,45 ----
#include "drivers/mga_vid.h"
+ #include "sub.h"
static vo_info_t vo_info =
***************
*** 111,118 ****
printf("vo: uninit!\n");
}
-
- 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));
static void flip_page(void)
--- 112,115 ----
Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** vo_xmga.c 2001/04/24 11:30:57 1.17
--- vo_xmga.c 2001/04/24 11:42:04 1.18
***************
*** 47,50 ****
--- 47,51 ----
#include "x11_common.h"
+ #include "sub.h"
#ifdef SHOW_TIME
***************
*** 142,149 ****
}
-
- 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));
static void flip_page(void){
--- 143,146 ----
Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** vo_xv.c 2001/04/24 11:30:57 1.16
--- vo_xv.c 2001/04/24 11:42:04 1.17
***************
*** 30,33 ****
--- 30,34 ----
#include "fastmemcpy.h"
+ #include "sub.h"
static vo_info_t vo_info =
***************
*** 260,266 ****
- //void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
- //void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
int x,y;
--- 261,264 ----
***************
*** 282,289 ****
}
-
- 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));
static void flip_page(void)
--- 280,283 ----
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** vo_sdl.c 2001/04/24 10:21:12 1.24
--- vo_sdl.c 2001/04/24 11:42:04 1.25
***************
*** 107,110 ****
--- 107,111 ----
#include "fastmemcpy.h"
+ #include "sub.h"
LIBVO_EXTERN(sdl)
***************
*** 164,170 ****
**/
- //void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
- //void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
-
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
struct sdl_priv_s *priv = &sdl_priv;
--- 165,168 ----
***************
*** 710,717 ****
* returns : doesn't return
**/
-
- 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));
static void flip_page (void)
--- 708,711 ----
Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** vo_svga.c 2001/04/24 10:21:12 1.22
--- vo_svga.c 2001/04/24 11:42:04 1.23
***************
*** 22,25 ****
--- 22,27 ----
#include "mmx.h"
+ #include "sub.h"
+
extern void rgb15to16_mmx(char* s0,char* d0,int count);
extern int vo_dbpp;
***************
*** 418,435 ****
return (&vo_info);
}
-
- extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
- unsigned char *srca, int srcstride, unsigned char* dstbase,
- int dststride);
- extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
- unsigned char *srca, int srcstride, unsigned char* dstbase,
- int dststride);
- extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
- unsigned char *srca, int srcstride, unsigned char* dstbase,
- int dststride);
- extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
- unsigned char *srca, int srcstride, unsigned char* dstbase,
- int dststride);
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
--- 420,425 ----
return (&vo_info);
}
+ #include "osd.h"
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
***************
*** 515,522 ****
return 0;
}
-
- 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));
static void flip_page(void) {
--- 505,508 ----
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** vo_x11.c 2001/04/24 11:30:57 1.16
--- vo_x11.c 2001/04/24 11:42:04 1.17
***************
*** 38,41 ****
--- 38,42 ----
#include "fastmemcpy.h"
+ #include "sub.h"
static vo_info_t vo_info =
***************
*** 388,403 ****
}
! extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
--- 389,393 ----
}
! #include "osd.h"
static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
***************
*** 418,425 ****
}
}
-
- 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));
static void flip_page( void ){
--- 408,411 ----
Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** vo_fbdev.c 2001/04/21 20:43:59 1.33
--- vo_fbdev.c 2001/04/24 11:42:04 1.34
***************
*** 997,1012 ****
}
! extern void vo_draw_alpha_rgb32(int w, int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb24(int w, int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb16(int w, int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb15(int w, int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
--- 997,1001 ----
}
! #include "osd.h"
static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
***************
*** 1089,1095 ****
}
! 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));
static void flip_page(void)
--- 1078,1082 ----
}
! #include "sub.h"
static void flip_page(void)
Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** vo_dga.c 2001/04/24 10:21:12 1.16
--- vo_dga.c 2001/04/24 11:42:04 1.17
***************
*** 24,27 ****
--- 24,30 ----
*
* $Log$
+ * Revision 1.17 2001/04/24 11:42:04 pontscho
+ * clean up
+ *
* Revision 1.16 2001/04/24 10:21:12 szabii
* some warnings killed
***************
*** 278,293 ****
//---------------------------------------------------------
! extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
! extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src,
! unsigned char *srca, int srcstride, unsigned char* dstbase,
! int dststride);
static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){
--- 281,285 ----
//---------------------------------------------------------
! #include "osd.h"
static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){
***************
*** 375,381 ****
//---------------------------------------------------------
! 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));
static void flip_page( void ){
--- 367,371 ----
//---------------------------------------------------------
! #include "sub.h"
static void flip_page( void ){
Index: video_out_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** video_out_internal.h 2001/04/10 02:29:38 1.3
--- video_out_internal.h 2001/04/24 11:42:04 1.4
***************
*** 43,49 ****
};
! void vo_draw_alpha_yv12(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
! void vo_draw_alpha_yuy2(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
!
--- 43,47 ----
};
! #include "osd.h"
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list