Pass fonts from content around as FontData.

i.e. as a block of memory rather than a file.  Also, get the
fonts from the decoder rather than the content.

Together, these changes allow us to use fonts from SMPTE DCPs
added as content.  Before, fonts would be messed up in those
cases (#1885).

1 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 5bf6363ad..b53b88ded 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,6 +20,7 @@
 
 #include "text_decoder.h"
 #include "dcp_subtitle.h"
+#include "font_data.h"
 
 class DCPSubtitleContent;
 
@@ -31,9 +32,13 @@ public:
 	bool pass ();
 	void seek (dcpomatic::ContentTime time, bool accurate);
 
+	std::vector<dcpomatic::FontData> fonts () const;
+
 private:
 	dcpomatic::ContentTimePeriod content_time_period (boost::shared_ptr<dcp::Subtitle> s) const;
 
 	std::list<boost::shared_ptr<dcp::Subtitle> > _subtitles;
 	std::list<boost::shared_ptr<dcp::Subtitle> >::const_iterator _next;
+
+	std::vector<dcpomatic::FontData> _fonts;
 };