Mercurial > mplayer.hg

comparison libvo/sub.c @ 27393:4876c89bafdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename font-related preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix.
author diego
date Thu, 07 Aug 2008 10:36:07 +0000
parents 14c5017f40d2
children 887ecb9a3792
comparison
equal deleted inserted replaced
27392:f28981b3f233 27393:4876c89bafdd
1063 #define FONT_LOAD_DEFER 6 1063 #define FONT_LOAD_DEFER 6
1064 1064
1065 int vo_update_osd(int dxs,int dys){ 1065 int vo_update_osd(int dxs,int dys){
1066 mp_osd_obj_t* obj=vo_osd_list; 1066 mp_osd_obj_t* obj=vo_osd_list;
1067 int chg=0; 1067 int chg=0;
1068 #ifdef HAVE_FREETYPE 1068 #ifdef CONFIG_FREETYPE
1069 static int defer_counter = 0, prev_dxs = 0, prev_dys = 0; 1069 static int defer_counter = 0, prev_dxs = 0, prev_dys = 0;
1070 #endif 1070 #endif
1071 1071
1072 #ifdef HAVE_FREETYPE 1072 #ifdef CONFIG_FREETYPE
1073 // here is the right place to get screen dimensions 1073 // here is the right place to get screen dimensions
1074 if (((dxs != vo_image_width) 1074 if (((dxs != vo_image_width)
1075 && (subtitle_autoscale == 2 || subtitle_autoscale == 3)) 1075 && (subtitle_autoscale == 2 || subtitle_autoscale == 3))
1076 || ((dys != vo_image_height) 1076 || ((dys != vo_image_height)
1077 && (subtitle_autoscale == 1 || subtitle_autoscale == 3))) 1077 && (subtitle_autoscale == 1 || subtitle_autoscale == 3)))
1196 new_osd_obj(OSDTYPE_DVDNAV); 1196 new_osd_obj(OSDTYPE_DVDNAV);
1197 #endif 1197 #endif
1198 #if CONFIG_TV_TELETEXT 1198 #if CONFIG_TV_TELETEXT
1199 new_osd_obj(OSDTYPE_TELETEXT); 1199 new_osd_obj(OSDTYPE_TELETEXT);
1200 #endif 1200 #endif
1201 #ifdef HAVE_FREETYPE 1201 #ifdef CONFIG_FREETYPE
1202 force_load_font = 1; 1202 force_load_font = 1;
1203 #endif 1203 #endif
1204 } 1204 }
1205 1205
1206 int vo_osd_changed_flag=0; 1206 int vo_osd_changed_flag=0;