Mercurial > mplayer.hg
changeset 28049:887ecb9a3792
Remove unused declarations and references to vo_draw_text_osd(),
vo_draw_text_progbar(), vo_draw_text_sub().
| author | diego |
|---|---|
| date | Wed, 03 Dec 2008 18:53:35 +0000 |
| parents | 3cfb920cbe4b |
| children | 7e53b0b71b18 |
| files | libvo/sub.c libvo/sub.h libvo/vo_aa.c |
| diffstat | 3 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/sub.c Wed Dec 03 15:25:27 2008 +0000 +++ b/libvo/sub.c Wed Dec 03 18:53:35 2008 +0000 @@ -637,8 +637,6 @@ subtitle* vo_sub=NULL; -// 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)) - inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ unsigned char *t; int c,i,j,l,x,y,font,prevc,counter;
--- a/libvo/sub.h Wed Dec 03 15:25:27 2008 +0000 +++ b/libvo/sub.h Wed Dec 03 18:53:35 2008 +0000 @@ -50,14 +50,6 @@ } mp_osd_obj_t; -#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 sub_data* subdata; //currently used subtitles @@ -113,9 +105,6 @@ extern int spu_aamode; extern float spu_gaussvar; -//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_remove_text(int dxs,int dys,void (*remove)(int x0,int y0, int w,int h)); @@ -134,6 +123,4 @@ void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); #endif -#endif /* 0 */ - #endif /* MPLAYER_SUB_H */
--- a/libvo/vo_aa.c Wed Dec 03 15:25:27 2008 +0000 +++ b/libvo/vo_aa.c Wed Dec 03 18:53:35 2008 +0000 @@ -237,7 +237,7 @@ /* nothing will change its size, be we need some values initialized */ resize(); - /* now init out own 'font' (to use vo_draw_text_sub without edit them) */ + /* now init our own 'font' */ if(!vo_font_save) vo_font_save = vo_font; if(vo_font == vo_font_save) { vo_font=malloc(sizeof(font_desc_t));//if(!desc) return NULL;