Mercurial > mplayer.hg
changeset 616:41d6eec69b60
clean up
| author | pontscho |
|---|---|
| date | Tue, 24 Apr 2001 11:42:04 +0000 |
| parents | b96e45bcb178 |
| children | 33b559940fb4 |
| files | libvo/sub.c libvo/sub.h libvo/video_out_internal.h libvo/vo_dga.c libvo/vo_fbdev.c libvo/vo_mga.c libvo/vo_sdl.c libvo/vo_svga.c libvo/vo_x11.c libvo/vo_xmga.c libvo/vo_xv.c subreader.h |
| diffstat | 12 files changed, 32 insertions(+), 90 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/sub.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/sub.c Tue Apr 24 11:42:04 2001 +0000 @@ -1,5 +1,4 @@ -#include "subreader.h" #include "sub.h" //static int vo_font_loaded=-1; @@ -89,7 +88,6 @@ } - 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)){
--- a/libvo/sub.h Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/sub.h Tue Apr 24 11:42:04 2001 +0000 @@ -1,3 +1,8 @@ + +#ifndef __MPLAYER_SUB_H +#define __MPLAYER_SUB_H + +#include "../subreader.h" extern font_desc_t* vo_font; @@ -25,4 +30,9 @@ #define OSD_PB_END 0x12 #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
--- a/libvo/video_out_internal.h Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/video_out_internal.h Tue Apr 24 11:42:04 2001 +0000 @@ -42,9 +42,7 @@ uninit,\ }; -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); +#include "osd.h" -
--- a/libvo/vo_dga.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_dga.c Tue Apr 24 11:42:04 2001 +0000 @@ -23,6 +23,9 @@ * - works only on x86 architectures * * $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 * @@ -277,18 +280,7 @@ //--------------------------------------------------------- -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); +#include "osd.h" static void draw_alpha( int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride ){ @@ -374,9 +366,7 @@ //--------------------------------------------------------- -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)); +#include "sub.h" static void flip_page( void ){
--- a/libvo/vo_fbdev.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_fbdev.c Tue Apr 24 11:42:04 2001 +0000 @@ -996,18 +996,7 @@ return &vo_info; } -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); +#include "osd.h" static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) @@ -1088,9 +1077,7 @@ } } -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)); +#include "sub.h" static void flip_page(void) {
--- a/libvo/vo_mga.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_mga.c Tue Apr 24 11:42:04 2001 +0000 @@ -40,6 +40,7 @@ #include <sys/mman.h> #include "drivers/mga_vid.h" +#include "sub.h" static vo_info_t vo_info = { @@ -111,10 +112,6 @@ 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) { vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
--- a/libvo/vo_sdl.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_sdl.c Tue Apr 24 11:42:04 2001 +0000 @@ -106,6 +106,7 @@ #include "video_out_internal.h" #include "fastmemcpy.h" +#include "sub.h" LIBVO_EXTERN(sdl) @@ -163,9 +164,6 @@ * **/ -//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; int x,y; @@ -710,10 +708,6 @@ * 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) { struct sdl_priv_s *priv = &sdl_priv;
--- a/libvo/vo_svga.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_svga.c Tue Apr 24 11:42:04 2001 +0000 @@ -21,6 +21,8 @@ #include "yuv2rgb.h" #include "mmx.h" +#include "sub.h" + extern void rgb15to16_mmx(char* s0,char* d0,int count); extern int vo_dbpp; extern int verbose; @@ -418,19 +420,7 @@ 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); - +#include "osd.h" static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { @@ -515,10 +505,6 @@ 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) { if (y_pos) { gl_fillbox(0, 0, WIDTH, y_pos, 0);
--- a/libvo/vo_x11.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_x11.c Tue Apr 24 11:42:04 2001 +0000 @@ -37,6 +37,7 @@ #include "x11_common.h" #include "fastmemcpy.h" +#include "sub.h" static vo_info_t vo_info = { @@ -387,18 +388,7 @@ #endif } -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); +#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){ @@ -418,10 +408,6 @@ } } -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 ){ vo_draw_text(image_width,image_height,draw_alpha); check_events();
--- a/libvo/vo_xmga.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_xmga.c Tue Apr 24 11:42:04 2001 +0000 @@ -46,6 +46,7 @@ #include <errno.h> #include "x11_common.h" +#include "sub.h" #ifdef SHOW_TIME #include "../linux/timer.h" @@ -142,10 +143,6 @@ } -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){ #ifdef SHOW_TIME unsigned int t;
--- a/libvo/vo_xv.c Tue Apr 24 11:35:07 2001 +0000 +++ b/libvo/vo_xv.c Tue Apr 24 11:42:04 2001 +0000 @@ -29,6 +29,7 @@ #include "x11_common.h" #include "fastmemcpy.h" +#include "sub.h" static vo_info_t vo_info = { @@ -259,9 +260,6 @@ } -//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; @@ -282,10 +280,6 @@ } -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) { vo_draw_text(image_width,image_height,draw_alpha);
--- a/subreader.h Tue Apr 24 11:35:07 2001 +0000 +++ b/subreader.h Tue Apr 24 11:42:04 2001 +0000 @@ -1,3 +1,6 @@ + +#ifndef __MPLAYER_SUBREADER_H +#define __MPLAYER_SUBREADER_H extern int sub_uses_time; extern int sub_errs; @@ -18,3 +21,5 @@ subtitle* sub_read_file (char *filename); char * sub_filename( char * fname ); + +#endif \ No newline at end of file