Mercurial > mplayer.hg
comparison libvo/sub.c @ 25851:9ebd00825df2
Allow independent scaling of vo_font and sub_font.
Patch by Guillaume LECERF (foxcore gmail com).
| author | reimar |
|---|---|
| date | Sun, 27 Jan 2008 15:14:02 +0000 |
| parents | 85f669a84e7a |
| children | e7c989f7a7c9 |
comparison
equal
deleted
inserted
replaced
| 25850:eab778ff9ce1 | 25851:9ebd00825df2 |
|---|---|
| 1088 if (defer_counter >= FONT_LOAD_DEFER) force_load_font = 1; | 1088 if (defer_counter >= FONT_LOAD_DEFER) force_load_font = 1; |
| 1089 } | 1089 } |
| 1090 | 1090 |
| 1091 if (force_load_font) { | 1091 if (force_load_font) { |
| 1092 force_load_font = 0; | 1092 force_load_font = 0; |
| 1093 load_font_ft(dxs, dys, &vo_font, font_name); | 1093 load_font_ft(dxs, dys, &vo_font, font_name, osd_font_scale_factor); |
| 1094 if (sub_font_name) | 1094 if (sub_font_name) |
| 1095 load_font_ft(dxs, dys, &sub_font, sub_font_name); | 1095 load_font_ft(dxs, dys, &sub_font, sub_font_name, text_font_scale_factor); |
| 1096 else | 1096 else |
| 1097 sub_font = vo_font; | 1097 load_font_ft(dxs, dys, &sub_font, font_name, text_font_scale_factor); |
| 1098 prev_dxs = dxs; | 1098 prev_dxs = dxs; |
| 1099 prev_dys = dys; | 1099 prev_dys = dys; |
| 1100 defer_counter = 0; | 1100 defer_counter = 0; |
| 1101 } else { | 1101 } else { |
| 1102 if (!vo_font) | 1102 if (!vo_font) |
| 1103 load_font_ft(dxs, dys, &vo_font, font_name); | 1103 load_font_ft(dxs, dys, &vo_font, font_name, osd_font_scale_factor); |
| 1104 if (!sub_font) { | 1104 if (!sub_font) { |
| 1105 if (sub_font_name) | 1105 if (sub_font_name) |
| 1106 load_font_ft(dxs, dys, &sub_font, sub_font_name); | 1106 load_font_ft(dxs, dys, &sub_font, sub_font_name, text_font_scale_factor); |
| 1107 else | 1107 else |
| 1108 sub_font = vo_font; | 1108 load_font_ft(dxs, dys, &sub_font, font_name, text_font_scale_factor); |
| 1109 } | 1109 } |
| 1110 } | 1110 } |
| 1111 #endif | 1111 #endif |
| 1112 | 1112 |
| 1113 while(obj){ | 1113 while(obj){ |