RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Add vobsub support, suppress conditionnal on USE_DVDREAD. 

DVD and VobSub subtitles are displayed even if fonts can't be loaded.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4082 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
kmkaplan 2002-01-10 17:21:00 +00:00
parent 1b6e300d94
commit 4d08add9a2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvo/sub.c
View File

@ -273,11 +273,13 @@ inline static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,in
}
void *vo_spudec=NULL;
#ifdef USE_DVDREAD
void *vo_vobsub=NULL;
inline static void vo_draw_spudec(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
spudec_draw(vo_spudec, draw_alpha);
}
#endif
inline static void vo_draw_vobsub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
vobsub_draw(vo_vobsub, dxs, dys, draw_alpha);
}
static int draw_alpha_init_flag=0;
@ -285,6 +287,14 @@ extern void vo_draw_alpha_init();
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)){
if(vo_spudec){
vo_draw_spudec(dxs,dys,draw_alpha);
}
if(vo_vobsub){
vo_draw_vobsub(dxs,dys,draw_alpha);
}
if(!vo_font) return; // no font
if(!draw_alpha_init_flag){
@ -303,11 +313,6 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h,
if(vo_osd_progbar_type>=0 && vo_font->font[OSD_PB_0]>=0){
vo_draw_text_progbar(dxs,dys,draw_alpha);
}
#ifdef USE_DVDREAD
if(vo_spudec){
vo_draw_spudec(dxs,dys,draw_alpha);
}
#endif
}