summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-09-18 22:13:18 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-09-18 22:18:33 +0200
commit4a9f618d9f3b2d964bcc819426cc3042b8e447f7 (patch)
treefeffc0c5996c49ad166da998e916c12e19a9548f
parent5249cccfcfb6c345a40dff2dee464d287fc69605 (diff)
downloadmpv-4a9f618d9f3b2d964bcc819426cc3042b8e447f7.tar.bz2
mpv-4a9f618d9f3b2d964bcc819426cc3042b8e447f7.tar.xz
osxbundle: fonts.conf: only look for fonts in ~/.mpv/fonts
This is to avoid the 30s hang while mpv caches fonts. In practice all the fonts an average user is going to use are embedded in mkv files so there is no reason to build fontconfig's cache on all of OS X system directories. I might add something similar for terminal usage, but I am highly undecided.
-rw-r--r--DOCS/man/en/options.rst7
-rw-r--r--TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf7
2 files changed, 9 insertions, 5 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 1c07403ea7..f9a75779f7 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -1452,6 +1452,13 @@
options) are ignored when ASS-subtitles are rendered, unless the
``--no-ass`` option is specified.
+ .. note::
+
+ By default the OS X Application Bundle ships with a default fontconfig
+ fonts.conf that looks for fonts in the ``~/.mpv/fonts`` folder. It does
+ not include standard OS X paths to reduce the time spent to build
+ fontconfig's cache.
+
``--osd-font-size=<size>``, ``--sub-text-font-size=<size>``
Specify the OSD/sub font size. The unit is the size in scaled pixels at a
window height of 720. The actual pixel size is scaled with the window
diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf
index 5a2e3d2222..c229cd13c0 100644
--- a/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf
+++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/fonts.conf
@@ -1,11 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
- <dir>/System/Library/Fonts</dir>
- <dir>/Library/Fonts</dir>
- <dir>~/Library/Fonts</dir>
- <dir>/Network/Library/Fonts</dir>
- <cachedir>~/.fontconfig</cachedir>
+ <dir>~/.mpv/fonts</dir>
+ <cachedir>~/.mpv/.fontconfig-cache</cachedir>
<!--
Accept deprecated 'mono' alias, replacing it with 'monospace'