[MPlayer-cvslog] r36826 - trunk/gui/app/cfg.c

[ib]

Author: ib
Date: Thu Feb 13 11:41:33 2014
New Revision: 36826

Log:
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).

Modified:
   trunk/gui/app/cfg.c

Modified: trunk/gui/app/cfg.c
==============================================================================
--- trunk/gui/app/cfg.c	Wed Feb 12 20:16:31 2014	(r36825)
+++ trunk/gui/app/cfg.c	Thu Feb 13 11:41:33 2014	(r36826)
@@ -226,8 +226,8 @@ static const m_option_t gui_opts[] = {
     { "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 },
 
-#ifdef CONFIG_FREETYPE
     { "font_encoding",               &subtitle_font_encoding,  CONF_TYPE_STRING,      0,           0,     0,          NULL },
+#ifdef CONFIG_FREETYPE
     { "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 },