Mercurial > mplayer.hg
annotate libvo/sub.c @ 4302:9f12fd5f47d0
Modified the cache option value setting/reading, so we can report
in any case the cache size value used.
author | bertrand |
---|---|
date | Tue, 22 Jan 2002 06:12:18 +0000 |
parents | 4435dc3b8bef |
children | 976bf6a9ded5 |
rev | line source |
---|---|
218 | 1 |
4088 | 2 #include "config.h" |
3 #include "video_out.h" | |
218 | 4 #include "sub.h" |
202 | 5 |
4088 | 6 #include <stdlib.h> |
2498 | 7 |
8 char * __sub_osd_names[]={ | |
9 "Seekbar", | |
10 "Play", | |
11 "Pause", | |
12 "Stop", | |
13 "Rewind", | |
14 "Forward", | |
15 "Clock", | |
16 "Contrast", | |
17 "Saturation", | |
18 "Volume", | |
19 "Brightness", | |
20 "Hue" | |
21 }; | |
22 char * __sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", ""}; | |
23 | |
213 | 24 //static int vo_font_loaded=-1; |
25 font_desc_t* vo_font=NULL; | |
202 | 26 |
1991
dee4b2ea5e5b
add gui support to config scripts, and fixed some warning.
pontscho
parents:
1878
diff
changeset
|
27 unsigned char* vo_osd_text=NULL; |
803
b25a887b6054
sub splitting patch applied by Vlada V.Dubsky@sh.cvut.cz
arpi_esp
parents:
726
diff
changeset
|
28 int sub_unicode=0; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
29 int sub_utf8=0; |
213 | 30 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
31 inline 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)){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
32 unsigned char *cp=vo_osd_text; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
33 int c; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
34 int font; |
213 | 35 int y=10; |
36 int x=20; | |
202 | 37 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
38 while (*cp){ |
1549 | 39 c=*cp++; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
40 if ((font=vo_font->font[c])>=0) |
213 | 41 draw_alpha(x,y, |
42 vo_font->width[c], | |
43 vo_font->pic_a[font]->h, | |
44 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
45 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
46 vo_font->pic_a[font]->w); | |
47 x+=vo_font->width[c]+vo_font->charspace; | |
48 } | |
218 | 49 |
50 } | |
51 | |
52 int vo_osd_progbar_type=-1; | |
1726 | 53 int vo_osd_progbar_value=100; // 0..256 |
54 | |
55 // if we have n=256 bars then OSD progbar looks like below | |
56 // | |
1878 | 57 // 0 1 2 3 ... 256 <= vo_osd_progbar_value |
58 // | | | | | | |
1726 | 59 // [ === === === ... === ] |
60 // | |
61 // the above schema is rescalled to n=elems bars | |
218 | 62 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
63 inline 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)){ |
1602 | 64 unsigned char *s; |
65 unsigned char *sa; | |
1726 | 66 int i,w,h,st,mark; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
67 int y=(dys-vo_font->height)/2; |
218 | 68 int c,font; |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
69 int delimw=vo_font->width[OSD_PB_START] |
1549 | 70 +vo_font->width[OSD_PB_END] |
71 +vo_font->charspace; | |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
72 int width=(2*dxs-3*delimw)/3; |
1549 | 73 int charw=vo_font->width[OSD_PB_0]+vo_font->charspace; |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
74 int elems=width/charw; |
1549 | 75 int x=(dxs-elems*charw-delimw)/2; |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
76 |
1726 | 77 if (vo_osd_progbar_value<=0) |
78 mark=0; | |
1878 | 79 else { |
80 int ev=vo_osd_progbar_value*elems; | |
81 mark=ev>>8; | |
82 if (ev & 0xFF) mark++; | |
83 if (mark>elems) mark=elems; | |
84 } | |
85 | |
1727 | 86 |
218 | 87 // printf("osd.progbar width=%d xpos=%d\n",width,x); |
88 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
89 c=vo_osd_progbar_type; |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
90 if(vo_osd_progbar_type>0 && (font=vo_font->font[c])>=0) { |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
91 int xp=x-vo_font->width[c]-vo_font->spacewidth; |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
92 draw_alpha((xp<0?0:xp),y, |
218 | 93 vo_font->width[c], |
94 vo_font->pic_a[font]->h, | |
95 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
96 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
97 vo_font->pic_a[font]->w); | |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
98 } |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
99 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
100 c=OSD_PB_START; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
101 if ((font=vo_font->font[c])>=0) |
218 | 102 draw_alpha(x,y, |
103 vo_font->width[c], | |
104 vo_font->pic_a[font]->h, | |
105 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
106 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
107 vo_font->pic_a[font]->w); | |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
108 x+=vo_font->width[c]+vo_font->charspace; |
218 | 109 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
110 c=OSD_PB_0; |
1602 | 111 if ((font=vo_font->font[c])>=0){ |
112 w=vo_font->width[c]; | |
113 h=vo_font->pic_a[font]->h; | |
114 s=vo_font->pic_b[font]->bmp+vo_font->start[c]; | |
115 sa=vo_font->pic_a[font]->bmp+vo_font->start[c]; | |
116 st=vo_font->pic_a[font]->w; | |
2204 | 117 if ((i=mark)) do { |
1602 | 118 draw_alpha(x,y,w,h,s,sa,st); |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
119 x+=charw; |
2204 | 120 } while(--i); |
1602 | 121 } |
202 | 122 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
123 c=OSD_PB_1; |
1602 | 124 if ((font=vo_font->font[c])>=0){ |
125 w=vo_font->width[c]; | |
126 h=vo_font->pic_a[font]->h; | |
127 s =vo_font->pic_b[font]->bmp+vo_font->start[c]; | |
128 sa=vo_font->pic_a[font]->bmp+vo_font->start[c]; | |
129 st=vo_font->pic_a[font]->w; | |
2204 | 130 if ((i=elems-mark)) do { |
1602 | 131 draw_alpha(x,y,w,h,s,sa,st); |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
132 x+=charw; |
2204 | 133 } while(--i); |
1602 | 134 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
135 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
136 c=OSD_PB_END; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
137 if ((font=vo_font->font[c])>=0) |
218 | 138 draw_alpha(x,y, |
139 vo_font->width[c], | |
140 vo_font->pic_a[font]->h, | |
141 vo_font->pic_b[font]->bmp+vo_font->start[c], | |
142 vo_font->pic_a[font]->bmp+vo_font->start[c], | |
143 vo_font->pic_a[font]->w); | |
1548
eee7951a23af
changes according to proper subfont bar positioning and char spaceing - sub.c
atlka
parents:
1524
diff
changeset
|
144 // x+=vo_font->width[c]+vo_font->charspace; |
803
b25a887b6054
sub splitting patch applied by Vlada V.Dubsky@sh.cvut.cz
arpi_esp
parents:
726
diff
changeset
|
145 |
218 | 146 |
147 // vo_osd_progbar_value=(vo_osd_progbar_value+1)&0xFF; | |
148 | |
149 } | |
150 | |
254 | 151 subtitle* vo_sub=NULL; |
218 | 152 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
153 #define MAX_UCS 1600 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
154 #define MAX_UCSLINES 16 |
218 | 155 |
1591 | 156 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
157 inline 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)){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
158 static int utbl[MAX_UCS+1]; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
159 static int xtbl[MAX_UCSLINES]; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
160 static int lines; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
161 static subtitle *memsub=NULL; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
162 static int memy; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
163 static int memdxs; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
164 static int memdys; |
1591 | 165 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
166 unsigned char *t; |
1591 | 167 int c,i,j,l,x,y,font; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
168 int len; |
1591 | 169 int k,lastk; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
170 int lastStripPosition; |
1591 | 171 int xsize,lastxsize; |
172 int h,lasth; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
173 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
174 if ((memsub!=vo_sub)||(memdxs!=dxs)||(memdys!=dys)){ |
1591 | 175 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
176 memsub=vo_sub; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
177 memdxs=dxs; |
1591 | 178 memdys=memy=dys; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
179 |
1602 | 180 // too long lines divide into a smaller ones |
1591 | 181 i=k=lines=lasth=0; |
182 h=vo_font->height; | |
183 xsize=-vo_font->charspace; | |
184 lastStripPosition=-1; | |
185 l=vo_sub->lines; | |
186 | |
2204 | 187 while (l) { |
188 l--; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
189 t=vo_sub->text[i++]; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
190 len=strlen(t)-1; |
1824 | 191 |
1852 | 192 // printf("sub(%d) '%s'\n",len,t); |
1824 | 193 // if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h |
194 // else | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
195 for (j=0;j<=len;j++){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
196 if ((c=t[j])>=0x80){ |
2176 | 197 if (sub_utf8){ |
198 if ((c & 0xe0) == 0xc0) /* 2 bytes U+00080..U+0007FF*/ | |
199 c = (c & 0x1f)<<6 | (t[++j] & 0x3f); | |
200 else if((c & 0xf0) == 0xe0)/* 3 bytes U+00800..U+00FFFF*/ | |
201 c = ((c & 0x0f)<<6 | | |
202 (t[++j] & 0x3f))<<6 | (t[++j] & 0x3f); | |
203 } else if (sub_unicode) | |
204 c = (c<<8) + t[++j]; | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
205 } |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
206 if (k==MAX_UCS){ |
2204 | 207 len=j; // end here |
2205 | 208 printf ("\nMAX_UCS exceeded!\n"); |
1591 | 209 } |
2204 | 210 if (!c) c++; // avoid UCS 0 |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
211 if (c==' '){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
212 lastk=k; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
213 lastStripPosition=j; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
214 lastxsize=xsize; |
2204 | 215 } else if ((font=vo_font->font[c])>=0){ |
1591 | 216 if (vo_font->pic_a[font]->h > h){ |
217 h=vo_font->pic_a[font]->h; | |
218 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
219 } |
2204 | 220 utbl[k++]=c; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
221 xsize+=vo_font->width[c]+vo_font->charspace; |
1591 | 222 if (dxs<xsize){ |
223 if (lastStripPosition>0){ | |
224 j=lastStripPosition; | |
225 xsize=lastxsize; | |
226 k=lastk; | |
227 } else { | |
228 xsize -=vo_font->width[c]+vo_font->charspace; // go back | |
229 k--; // cut line here | |
230 while (t[j] && t[j]!=' ') j++; // jump to the nearest space | |
231 } | |
232 } else if (j<len) | |
233 continue; | |
234 if (h>memy){ // out of the screen so end parsing | |
2205 | 235 memy -= lasth - vo_font->height; // correct the y position |
2204 | 236 l=0; |
237 break; | |
1591 | 238 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
239 utbl[k++]=0; |
1591 | 240 xtbl[lines++]=(dxs-xsize)/2; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
241 if (lines==MAX_UCSLINES||k>MAX_UCS){ |
2204 | 242 l=0; len=j; // end parsing |
1602 | 243 } else if(l || j<len){ // not the last line or not the last char |
1591 | 244 lastStripPosition=-1; |
245 xsize=-vo_font->charspace; | |
246 lasth=h; | |
247 h=vo_font->height; | |
248 } | |
2176 | 249 // printf("h: %d -> %d \n",vo_font->height,h); |
1591 | 250 memy -=h; // according to max of vo_font->pic_a[font]->h |
251 } | |
1573
c394d04d6b30
changes according to max of vo_font->pic_a[font]->h for the last line of subs
atlka
parents:
1569
diff
changeset
|
252 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
253 } |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
254 |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
255 y = memy; |
1824 | 256 |
257 // printf("lines=%d y=%d\n",lines,y); | |
202 | 258 |
2204 | 259 i=j=0; |
260 if ((l=lines)) for (;;) { | |
261 x=xtbl[i++]; | |
1591 | 262 while ((c=utbl[j++])){ |
2176 | 263 if ((font=vo_font->font[c])>=0) |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
264 draw_alpha(x,y, |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
265 vo_font->width[c], |
1824 | 266 vo_font->pic_a[font]->h+y<dys ? vo_font->pic_a[font]->h : dys-y, |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
267 vo_font->pic_b[font]->bmp+vo_font->start[c], |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
268 vo_font->pic_a[font]->bmp+vo_font->start[c], |
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
269 vo_font->pic_a[font]->w); |
2204 | 270 x+=vo_font->width[c]+vo_font->charspace; |
1569
fcbfc99cf8e6
skip lines with negative y position if there is too many lines to display
atlka
parents:
1549
diff
changeset
|
271 } |
2204 | 272 if (!--l) |
273 return; | |
1591 | 274 y+=vo_font->height; |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1109
diff
changeset
|
275 } |
218 | 276 } |
277 | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
278 void *vo_spudec=NULL; |
4081
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
279 void *vo_vobsub=NULL; |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
280 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)){ |
4087 | 281 spudec_draw_scaled(vo_spudec, dxs, dys, draw_alpha); |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
282 } |
4081
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
283 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)){ |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
284 vobsub_draw(vo_vobsub, dxs, dys, draw_alpha); |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
285 } |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
286 |
947
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
287 static int draw_alpha_init_flag=0; |
218 | 288 |
1109 | 289 extern void vo_draw_alpha_init(); |
290 | |
218 | 291 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)){ |
292 | |
4081
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
293 if(vo_spudec){ |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
294 vo_draw_spudec(dxs,dys,draw_alpha); |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
295 } |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
296 |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
297 if(vo_vobsub){ |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
298 vo_draw_vobsub(dxs,dys,draw_alpha); |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
299 } |
9e581ab5e54b
Add vobsub support, suppress conditionnal on USE_DVDREAD.
kmkaplan
parents:
3180
diff
changeset
|
300 |
218 | 301 if(!vo_font) return; // no font |
302 | |
947
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
303 if(!draw_alpha_init_flag){ |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
304 draw_alpha_init_flag=1; |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
305 vo_draw_alpha_init(); |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
306 } |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
865
diff
changeset
|
307 |
218 | 308 if(vo_osd_text){ |
309 vo_draw_text_osd(dxs,dys,draw_alpha); | |
310 } | |
311 | |
254 | 312 if(vo_sub){ |
218 | 313 vo_draw_text_sub(dxs,dys,draw_alpha); |
314 } | |
315 | |
1822 | 316 if(vo_osd_progbar_type>=0 && vo_font->font[OSD_PB_0]>=0){ |
218 | 317 vo_draw_text_progbar(dxs,dys,draw_alpha); |
318 } | |
3034
24d3dca4e813
DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
arpi
parents:
2498
diff
changeset
|
319 |
202 | 320 } |
1726 | 321 |