From d1a46c2c327dad53f1e8808e16c626530be163d1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 24 Oct 2015 19:09:35 +0200
Subject: options: remove --use-text-osd

---
 DOCS/interface-changes.rst |  2 ++
 DOCS/man/options.rst       | 11 -----------
 options/options.c          |  2 --
 options/options.h          |  1 -
 sub/osd_libass.c           |  3 ---
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 4c5c694483..fa041fc534 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,8 @@ Interface changes
 ::
 
  --- mpv 0.12.0 ---
+    - remove --use-text-osd (useless; fontconfig isn't a requirement anymore,
+      and text rendering is also lazily initialized)
     - some time properties (at least "playback-time", "time-pos",
       "time-remaining", "playtime-remaining") now are unavailable if the time
       is unknown, instead of just assuming that the internal playback position
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index e4a1050c5d..c1a34317b1 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2669,17 +2669,6 @@ OSD
 
     Default: 0.
 
-``--use-text-osd=<yes|no>``
-    Disable text OSD rendering completely. (This includes the complete OSC as
-    well.) This is mostly useful for avoiding loading fontconfig in situations
-    where fontconfig does not behave well, and OSD is unused - this could for
-    example allow GUI programs using libmpv to workaround fontconfig issues.
-
-    Note that selecting subtitles of any kind still initializes fontconfig.
-
-    Default: ``no``.
-
-
 Screenshot
 ----------
 
diff --git a/options/options.c b/options/options.c
index 4e63332444..06ffac708c 100644
--- a/options/options.c
+++ b/options/options.c
@@ -374,7 +374,6 @@ const m_option_t mp_opts[] = {
     OPT_FLOATRANGE("osd-bar-w", osd_bar_w, 0, 1, 100),
     OPT_FLOATRANGE("osd-bar-h", osd_bar_h, 0, 0.1, 50),
     OPT_SUBSTRUCT("osd", osd_style, osd_style_conf, 0),
-    OPT_FLAG("use-text-osd", use_text_osd, CONF_GLOBAL),
     OPT_SUBSTRUCT("sub-text", sub_text_style, sub_style_conf, 0),
     OPT_FLAG("sub-clear-on-seek", sub_clear_on_seek, 0),
 
@@ -715,7 +714,6 @@ const struct MPOpts mp_default_opts = {
     .sub_use_margins = 1,
     .ass_scale_with_window = 0,
     .sub_scale_with_window = 1,
-    .use_text_osd = 1,
 #if HAVE_LUA
     .lua_load_osc = 1,
     .lua_load_ytdl = 1,
diff --git a/options/options.h b/options/options.h
index e76c0cbf0c..1379ce3416 100644
--- a/options/options.h
+++ b/options/options.h
@@ -234,7 +234,6 @@ typedef struct MPOpts {
     char **sub_paths;
     int sub_auto;
     int audiofile_auto;
-    int use_text_osd;
     int osd_bar_visible;
     float osd_bar_align_x;
     float osd_bar_align_y;
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index bc4a24228a..e9225a891a 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -471,9 +471,6 @@ static void update_object(struct osd_state *osd, struct osd_object *obj)
 void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj,
                             struct sub_bitmaps *out_imgs)
 {
-    if (!osd->opts->use_text_osd)
-        return;
-
     if (obj->force_redraw)
         update_object(osd, obj);
 
-- 
cgit v1.2.3