From fa2c49210c9fcf0f26205927aec0aceb13ca69ce Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 9 Jul 2018 20:10:09 +0100
Subject: Don't write multiple <LoadFont> tags to Interop subtitles (#1273).

---
 src/lib/dcp_encoder.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 3a4a793a8..f1e819083 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -94,7 +94,18 @@ DCPEncoder::go ()
 	}
 
 	if (_non_burnt_subtitles) {
-		_writer->write (_player->get_subtitle_fonts ());
+		list<shared_ptr<Font> > 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.
+			*/
+			shared_ptr<Font> first = fonts.front ();
+			fonts.clear ();
+			fonts.push_back (first);
+		}
+
+		_writer->write (fonts);
 	}
 
 	while (!_player->pass ()) {}
-- 
cgit v1.2.3