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, 12 deletions

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index f1c412539..e3443c1ad 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -104,18 +104,7 @@ DCPEncoder::go ()
 	}
 
 	if (_non_burnt_subtitles) {
-		auto fonts = _player->get_subtitle_fonts ();
-
-		if (fonts.size() > 1 && _film->interop()) {
-			/* Interop will ignore second and subsequent <LoadFont>s so don't even
-			   write them as they upset some validators.
-			*/
-			auto first = fonts.front();
-			fonts.clear ();
-			fonts.push_back (first);
-		}
-
-		_writer->write (fonts);
+		_writer->write(_player->get_subtitle_fonts());
 	}
 
 	while (!_player->pass ()) {}