From f8c350489897ba3da192cf7709444a7793b1bcd0 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 30 Dec 2015 08:32:31 -0800 Subject: [PATCH] Remove the OS X fontconfig init logic from the libass provider --- src/subtitles_provider_libass.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp index 8090d2651..efb5cb481 100644 --- a/src/subtitles_provider_libass.cpp +++ b/src/subtitles_provider_libass.cpp @@ -53,11 +53,6 @@ #include #include -#ifdef __APPLE__ -#include -#include -#endif - extern "C" { #include } @@ -81,12 +76,6 @@ void msg_callback(int level, const char *fmt, va_list args, void *) { LOG_D("subtitle/provider/libass") << buf; } -#ifdef __APPLE__ -#define CONFIG_PATH (agi::util::GetBundleResourcesDirectory() + "/etc/fonts/fonts.conf").c_str() -#else -#define CONFIG_PATH nullptr -#endif - // Stuff used on the cache thread, owned by a shared_ptr in case the provider // gets deleted before the cache finishing updating struct cache_thread_shared { @@ -146,7 +135,7 @@ public: ass_renderer_done(shared->renderer); shared->renderer = ass_renderer_init(library); ass_set_font_scale(shared->renderer, 1.); - ass_set_fonts(shared->renderer, nullptr, "Sans", 1, CONFIG_PATH, true); + ass_set_fonts(shared->renderer, nullptr, "Sans", 1, nullptr, true); } }; @@ -159,7 +148,7 @@ LibassSubtitlesProvider::LibassSubtitlesProvider(agi::BackgroundRunner *br) auto ass_renderer = ass_renderer_init(library); if (ass_renderer) { ass_set_font_scale(ass_renderer, 1.); - ass_set_fonts(ass_renderer, nullptr, "Sans", 1, CONFIG_PATH, true); + ass_set_fonts(ass_renderer, nullptr, "Sans", 1, nullptr, true); } state->renderer = ass_renderer; state->ready = true; @@ -229,7 +218,7 @@ void CacheFonts() { // Initialize a renderer to force fontconfig to update its cache cache_queue->Async([] { auto ass_renderer = ass_renderer_init(library); - ass_set_fonts(ass_renderer, nullptr, "Sans", 1, CONFIG_PATH, true); + ass_set_fonts(ass_renderer, nullptr, "Sans", 1, nullptr, true); ass_renderer_done(ass_renderer); }); }