X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=e4cb76d792712064498be8f858573c271fd6b7be;hb=d83a98096b8675905d78c6fd4e6af1091c2f663e;hp=4b4785cc6e362021cab8c4ba6c8cada370810c23;hpb=9b946fc5250eff5a5dd4a661896916fcd5d9bd4b;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 4b4785cc6..e4cb76d79 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -104,23 +104,12 @@ 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 ()) {}
 
-	for (auto i: _player->get_reel_assets()) {
+	for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
 		_writer->write (i);
 	}
 
@@ -132,16 +121,6 @@ DCPEncoder::go ()
 void
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {
-	if (!_film->three_d()) {
-		if (data->eyes() == EYES_LEFT) {
-			/* Use left-eye images for both eyes... */
-			data->set_eyes (EYES_BOTH);
-		} else if (data->eyes() == EYES_RIGHT) {
-			/* ...and discard the right */
-			return;
-		}
-	}
-
 	_j2k_encoder->encode (data, time);
 }
 
@@ -158,7 +137,7 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 void
 DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+	if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
 		_writer->write (data, type, track, period);
 	}
 }