Mercurial > mplayer.hg
changeset 865:83919c1b9924
removed redundant osd.h includes
| author | arpi_esp |
|---|---|
| date | Thu, 24 May 2001 20:48:45 +0000 |
| parents | f0a3b5bf2e7a |
| children | 91087aaea5c7 |
| files | libvo/sub.c libvo/sub.h libvo/vo_dga.c libvo/vo_fbdev.c libvo/vo_svga.c libvo/vo_x11.c |
| diffstat | 6 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/sub.c Thu May 24 20:14:28 2001 +0000 +++ b/libvo/sub.c Thu May 24 20:48:45 2001 +0000 @@ -7,7 +7,7 @@ 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 @@ 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 @@ 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;
--- a/libvo/sub.h Thu May 24 20:14:28 2001 +0000 +++ b/libvo/sub.h Thu May 24 20:48:45 2001 +0000 @@ -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 @@ #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
--- a/libvo/vo_dga.c Thu May 24 20:14:28 2001 +0000 +++ b/libvo/vo_dga.c Thu May 24 20:48:45 2001 +0000 @@ -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 @@ //--------------------------------------------------------- -#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;
--- a/libvo/vo_fbdev.c Thu May 24 20:14:28 2001 +0000 +++ b/libvo/vo_fbdev.c Thu May 24 20:48:45 2001 +0000 @@ -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);