changeset 36544:cc8102c4ca83

Add option 'sub_utf8' to the GUI configuration file. UTF-8 subtitles couldn't be set without iconv using the GUI so far. Additionally, update man page.
author ib
date Sun, 19 Jan 2014 15:10:42 +0000
parents ab3dbe1559d0
children f0e92381681d
files DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 gui/app/cfg.c
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/de/mplayer.1	Sun Jan 19 15:00:09 2014 +0000
+++ b/DOCS/man/de/mplayer.1	Sun Jan 19 15:10:42 2014 +0000
@@ -33,7 +33,7 @@
 .\" Titel
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "18.01.2014" "Das MPlayer Projekt"
+.TH MPlayer 1 "19.01.2014" "Das MPlayer Projekt"
 .
 .SH NAME
 mplayer  \- Movie Player
@@ -685,6 +685,8 @@
 .RB ( subpos ),
 sub_unicode
 .RB ( unicode ),
+sub_utf8
+.RB ( utf8 ),
 v_flip
 .RB ( flip ),
 v_framedrop
--- a/DOCS/man/en/mplayer.1	Sun Jan 19 15:00:09 2014 +0000
+++ b/DOCS/man/en/mplayer.1	Sun Jan 19 15:10:42 2014 +0000
@@ -31,7 +31,7 @@
 .\" Title
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2014-01-18" "The MPlayer Project" "The Movie Player"
+.TH MPlayer 1 "2014-01-19" "The MPlayer Project" "The Movie Player"
 .
 .SH NAME
 mplayer  \- movie player
@@ -669,6 +669,8 @@
 .RB ( subpos ),
 sub_unicode
 .RB ( unicode ),
+sub_utf8
+.RB ( utf8 ),
 v_flip
 .RB ( flip ),
 v_framedrop
--- a/gui/app/cfg.c	Sun Jan 19 15:00:09 2014 +0000
+++ b/gui/app/cfg.c	Sun Jan 19 15:10:42 2014 +0000
@@ -221,6 +221,7 @@
     { "sub_overlap",                 &suboverlap_enabled,      CONF_TYPE_FLAG,        0,           0,     0,          NULL },
     { "sub_pos",                     &sub_pos,                 CONF_TYPE_INT,         CONF_RANGE,  0,     200,        NULL },
     { "sub_unicode",                 &sub_unicode,             CONF_TYPE_FLAG,        0,           0,     1,          NULL },
+    { "sub_utf8",                    &sub_utf8,                CONF_TYPE_FLAG,        0,           0,     1,          NULL },
 
     { "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 },