Mercurial > mplayer.hg

diff gui/app/cfg.c @ 36730:8bc4d669c5d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable option font_encoding without freetype. subtitle_font_encoding is now also used when freetype is disabled. This is corresponding to r36825, although the GUI doesn't support changing the option through the preferences in this case (but it's in gui.conf at least).
author ib
date Thu, 13 Feb 2014 10:41:33 +0000
parents eed2fb870f43
children 677d96fe1b93
line wrap: on
line diff
--- a/gui/app/cfg.c	Wed Feb 12 19:16:31 2014 +0000
+++ b/gui/app/cfg.c	Thu Feb 13 10:41:33 2014 +0000
@@ -226,8 +226,8 @@
     { "font_factor",                 &font_factor,             CONF_TYPE_FLOAT,       CONF_RANGE,  0.0,   10.0,       NULL },
     { "font_name",                   &font_name,               CONF_TYPE_STRING,      0,           0,     0,          NULL },
 
+    { "font_encoding",               &subtitle_font_encoding,  CONF_TYPE_STRING,      0,           0,     0,          NULL },
 #ifdef CONFIG_FREETYPE
-    { "font_encoding",               &subtitle_font_encoding,  CONF_TYPE_STRING,      0,           0,     0,          NULL },
     { "font_text_scale",             &text_font_scale_factor,  CONF_TYPE_FLOAT,       CONF_RANGE,  0.0,   100.0,      NULL },
     { "font_osd_scale",              &osd_font_scale_factor,   CONF_TYPE_FLOAT,       CONF_RANGE,  0.0,   100.0,      NULL },
     { "font_blur",                   &subtitle_font_radius,    CONF_TYPE_FLOAT,       CONF_RANGE,  0.0,   8.0,        NULL },