Mercurial > mplayer.hg
changeset 254:57f0156416e3
use subreader's sub struct
| author | arpi_esp |
|---|---|
| date | Fri, 30 Mar 2001 03:01:50 +0000 |
| parents | f86bc209160b |
| children | 9e9a000fe4b4 |
| files | libvo/sub.c libvo/sub.h |
| diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/sub.c Fri Mar 30 00:22:34 2001 +0000 +++ b/libvo/sub.c Fri Mar 30 03:01:50 2001 +0000 @@ -1,4 +1,5 @@ +#include "subreader.h" #include "sub.h" //static int vo_font_loaded=-1; @@ -89,17 +90,16 @@ } -int vo_sub_lines=2; -unsigned char* vo_sub_text[8]; +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)){ int i; int y; - y=dys-(1+vo_sub_lines)*vo_font->height; + y=dys-(1+vo_sub->lines)*vo_font->height; - for(i=0;i<vo_sub_lines;i++){ - unsigned char* text="Hello World! HÛDEJÓ!"; //vo_sub_text[i]; + for(i=0;i<vo_sub->lines;i++){ + unsigned char* text=vo_sub->text[i];// "Hello World! HÛDEJÓ!"; int len=strlen(text); int j; int xsize=-vo_font->charspace; @@ -144,7 +144,7 @@ vo_draw_text_osd(dxs,dys,draw_alpha); } - if(vo_sub_lines>0){ + if(vo_sub){ vo_draw_text_sub(dxs,dys,draw_alpha); }
--- a/libvo/sub.h Fri Mar 30 00:22:34 2001 +0000 +++ b/libvo/sub.h Fri Mar 30 03:01:50 2001 +0000 @@ -6,8 +6,7 @@ extern int vo_osd_progbar_type; extern int vo_osd_progbar_value; // 0..255 -extern int vo_sub_lines; -extern unsigned char* vo_sub_text[8]; +extern subtitle* vo_sub; #define OSD_PLAY 0x01 #define OSD_PAUSE 0x02