Mercurial > mplayer.hg

changeset 8819:477d42e66e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update font scale after changing pancan. It makes fonts keep scale when they are set to be proportional to width.
author filon
date Mon, 06 Jan 2003 12:27:39 +0000
parents 499d64f880d3
children 56fc9c8a8692
files libvo/sub.c mplayer.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/sub.c	Mon Jan 06 12:23:59 2003 +0000
+++ b/libvo/sub.c	Mon Jan 06 12:27:39 2003 +0000
@@ -534,7 +534,7 @@
 
 #ifdef HAVE_FREETYPE    
     // here is the right place to get screen dimensions
-    if (!vo_font && force_load_font) {
+    if (!vo_font || force_load_font) {
 	force_load_font = 0;
 	load_font_ft(dxs, dys);
     }
--- a/mplayer.c	Mon Jan 06 12:23:59 2003 +0000
+++ b/mplayer.c	Mon Jan 06 12:27:39 2003 +0000
@@ -2561,6 +2561,11 @@
 	  vo_osd_progbar_type=OSD_PANSCAN;
 	  vo_osd_progbar_value=vo_panscan*256;
 	  vo_osd_changed(OSDTYPE_PROGBAR);
+#ifdef HAVE_FREETYPE
+	  if (subtitle_autoscale == 2)
+	    // force scaling font to movie width
+	    force_load_font = 1;
+#endif
         }
 #endif
        }