From 26190dbe579833ab0a5d5ccc754a908af94fbda0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 25 Nov 2014 11:08:25 +0100
Subject: player: add option not to use OSD/fontconfig

Makeshift-solution for working around certain fontconfig issues.

With --use-text-osd=no, libass and fontconfig won't be initialized, and
fontconfig won't block everything with scanning for fonts.
---
 options/options.c | 2 ++
 options/options.h | 1 +
 2 files changed, 3 insertions(+)

(limited to 'options')

diff --git a/options/options.c b/options/options.c
index 7f78d884a6..3327b206e1 100644
--- a/options/options.c
+++ b/options/options.c
@@ -351,6 +351,7 @@ 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, osd_style_conf, 0),
     OPT_FLAG("sub-clear-on-seek", sub_clear_on_seek, 0),
 
@@ -610,6 +611,7 @@ const struct MPOpts mp_default_opts = {
     .osd_bar_h = 3.125,
     .osd_scale = 1,
     .osd_scale_by_window = 1,
+    .use_text_osd = 1,
 #if HAVE_LUA
     .lua_load_osc = 1,
     .lua_load_ytdl = 0,
diff --git a/options/options.h b/options/options.h
index 752d1f4801..dadcb0800a 100644
--- a/options/options.h
+++ b/options/options.h
@@ -224,6 +224,7 @@ typedef struct MPOpts {
     char **sub_name;
     char **sub_paths;
     int sub_auto;
+    int use_text_osd;
     int osd_bar_visible;
     float osd_bar_align_x;
     float osd_bar_align_y;
-- 
cgit v1.2.3