Mercurial > mplayer.hg
comparison mplayer.c @ 15079:1b96e77f5c33
remove force_load_font stuff moved to sub.c
author | henry |
---|---|
date | Sat, 09 Apr 2005 22:38:41 +0000 |
parents | aab0ddfabf3f |
children | 96512bcb2eca |
comparison
equal
deleted
inserted
replaced
15078:b22f4ce0580a | 15079:1b96e77f5c33 |
---|---|
3280 #ifdef HAVE_NEW_GUI | 3280 #ifdef HAVE_NEW_GUI |
3281 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN ); | 3281 if ( use_gui ) guiGetEvent( guiIEvent,(char *)MP_CMD_GUI_FULLSCREEN ); |
3282 else | 3282 else |
3283 #endif | 3283 #endif |
3284 if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0); | 3284 if(video_out && vo_config_count) video_out->control(VOCTRL_FULLSCREEN, 0); |
3285 // reload font when panscan > 0 and font is proportional to video size | |
3286 if (sh_video && (subtitle_autoscale == 2 || subtitle_autoscale == 3) | |
3287 && vo_panscan > 0) force_load_font = 1; | |
3288 } break; | 3285 } break; |
3289 case MP_CMD_VO_ONTOP: | 3286 case MP_CMD_VO_ONTOP: |
3290 { | 3287 { |
3291 if(video_out && vo_config_count) { | 3288 if(video_out && vo_config_count) { |
3292 video_out->control(VOCTRL_ONTOP, 0); | 3289 video_out->control(VOCTRL_ONTOP, 0); |
3324 osd_visible=sh_video->fps; // 1 sec | 3321 osd_visible=sh_video->fps; // 1 sec |
3325 vo_osd_progbar_type=OSD_PANSCAN; | 3322 vo_osd_progbar_type=OSD_PANSCAN; |
3326 vo_osd_progbar_value=vo_panscan*256; | 3323 vo_osd_progbar_value=vo_panscan*256; |
3327 vo_osd_changed(OSDTYPE_PROGBAR); | 3324 vo_osd_changed(OSDTYPE_PROGBAR); |
3328 } | 3325 } |
3329 #ifdef HAVE_FREETYPE | |
3330 if (sh_video && (subtitle_autoscale == 2 || subtitle_autoscale == 3)) | |
3331 // force scaling font to movie width or diagonal | |
3332 force_load_font = 1; | |
3333 #endif | |
3334 #endif | 3326 #endif |
3335 } | 3327 } |
3336 } break; | 3328 } break; |
3337 case MP_CMD_SUB_POS: | 3329 case MP_CMD_SUB_POS: |
3338 { | 3330 { |