mirror of
https://github.com/mpv-player/mpv
synced 2024-12-18 12:55:16 +00:00
Remove unused declarations and references to vo_draw_text_osd(),
vo_draw_text_progbar(), vo_draw_text_sub(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
0a5006b175
commit
fda888c61c
@ -637,8 +637,6 @@ inline static void vo_update_text_progbar(mp_osd_obj_t* obj,int dxs,int dys){
|
||||
|
||||
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;
|
||||
|
13
libvo/sub.h
13
libvo/sub.h
@ -50,14 +50,6 @@ typedef struct mp_osd_obj_s {
|
||||
} 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_alignment;
|
||||
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 @@ unsigned utf8_get_char(const char **str);
|
||||
void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey);
|
||||
#endif
|
||||
|
||||
#endif /* 0 */
|
||||
|
||||
#endif /* MPLAYER_SUB_H */
|
||||
|
@ -237,7 +237,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width,
|
||||
/* 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;
|
||||
|
Loading…
Reference in New Issue
Block a user