Fix subtitle font handling with in-memory fonts from SMPTE (#2509).v2.16.52

Previously we would fail to make a font available if it came from
a SMPTE MXF.  In that case we have a memory buffer containing the
TTF/OTF file but no file; here we add a hack/workaround so that
in-memory font files can be used by FontConfig.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/lib/font_config.h b/src/lib/font_config.h
index 6dadbae8a..edcb4be36 100644
--- a/src/lib/font_config.h
+++ b/src/lib/font_config.h
@@ -31,14 +31,19 @@ class FontConfig
 public:
 	static FontConfig* instance();
 
-	std::string make_font_available(boost::filesystem::path font_file);
+	std::string make_font_available(std::shared_ptr<dcpomatic::Font> font);
 	boost::optional<boost::filesystem::path> system_font_with_name(std::string name);
 
+	static void drop();
+
 private:
 	FontConfig();
+	~FontConfig();
 
 	FcConfig* _config = nullptr;
-	std::map<boost::filesystem::path, std::string> _available_fonts;
+	std::map<std::string, std::string> _available_fonts;
+
+	std::vector<boost::filesystem::path> _temp_files;
 
 	static FontConfig* _instance;
 };