Rearrange subtitle font management.

With this change each subtitle coming out of the player has a reference
to a dcpomatic::Font that belongs to the TextContent.  This hopefully
solves a few problems which all basically stemmed from the fact that
previously the decoders/player were deciding what the font ID in the
output DCP would be - they can't do that properly.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/lib/player.h b/src/lib/player.h
index 7d99c22c6..694ee70b7 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -45,10 +45,6 @@ namespace dcp {
 	class ReelAsset;
 }
 
-namespace dcpomatic {
-	class FontData;
-}
-
 class AtmosContent;
 class AudioBuffers;
 class Content;
@@ -84,7 +80,7 @@ public:
 	bool pass ();
 	void seek (dcpomatic::DCPTime time, bool accurate);
 
-	std::vector<dcpomatic::FontData> get_subtitle_fonts ();
+	std::vector<std::shared_ptr<dcpomatic::Font>> get_subtitle_fonts ();
 	std::list<ReferencedReelAsset> get_reel_assets ();
 	dcp::Size video_container_size () const {
 		boost::mutex::scoped_lock lm (_mutex);