X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=99edb005066524cc683fd2a24a00f1df5cb87204;hb=372555641062f5c7c6e4a1d5f67cfaf12a2c6799;hp=67235e5968e419c3c08a70c5301afeef5c955587;hpb=7686d48aab59eeca84b32c74606453628977d903;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 67235e596..99edb0050 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,7 +35,7 @@
 #include "writer.h"
 #include "compose.hpp"
 #include "referenced_reel_asset.h"
-#include "subtitle_content.h"
+#include "text_content.h"
 #include "player_video.h"
 #include <boost/signals2.hpp>
 #include <boost/foreach.hpp>
@@ -49,6 +49,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
+using namespace dcpomatic;
 
 /** Construct a DCP encoder.
  *  @param film Film that we are encoding.
@@ -56,14 +58,18 @@ using boost::dynamic_pointer_cast;
  */
 DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	: Encoder (film, job)
-	, _film (film)
-	, _job (job)
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
+	_player_video_connection = _player->Video.connect (bind (&DCPEncoder::video, this, _1, _2));
+	_player_audio_connection = _player->Audio.connect (bind (&DCPEncoder::audio, this, _1, _2));
+	_player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
+
 	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-		if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
-			_non_burnt_subtitles = true;
+		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+			if (i->use() && !i->burn()) {
+				_non_burnt_subtitles = true;
+			}
 		}
 	}
 }
@@ -73,7 +79,7 @@ DCPEncoder::~DCPEncoder ()
 	/* We must stop receiving more video data before we die */
 	_player_video_connection.release ();
 	_player_audio_connection.release ();
-	_player_subtitle_connection.release ();
+	_player_text_connection.release ();
 }
 
 void
@@ -92,7 +98,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 ()) {}
@@ -120,7 +137,7 @@ DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-	_writer->write (data);
+	_writer->write (data, time);
 
 	shared_ptr<Job> job = _job.lock ();
 	DCPOMATIC_ASSERT (job);
@@ -128,10 +145,10 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (_non_burnt_subtitles) {
-		_writer->write (data, period);
+	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+		_writer->write (data, type, track, period);
 	}
 }