X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=99edb005066524cc683fd2a24a00f1df5cb87204;hb=2fc2c321a45f9cfb1d1e09989f346ee6d44c0fa4;hp=f518aefefd4ca1951f8043445331d57aa55f8875;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index f518aefef..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 "caption_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.
@@ -61,10 +63,10 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 {
 	_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_caption_connection = _player->Caption.connect (bind (&DCPEncoder::caption, this, _1, _2, _3));
+	_player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
 
 	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-		BOOST_FOREACH (shared_ptr<CaptionContent> i, c->caption) {
+		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
 			if (i->use() && !i->burn()) {
 				_non_burnt_subtitles = true;
 			}
@@ -77,7 +79,7 @@ DCPEncoder::~DCPEncoder ()
 	/* We must stop receiving more video data before we die */
 	_player_video_connection.release ();
 	_player_audio_connection.release ();
-	_player_caption_connection.release ();
+	_player_text_connection.release ();
 }
 
 void
@@ -143,10 +145,10 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::caption (PlayerCaption data, CaptionType type, DCPTimePeriod period)
+DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-	if (type == CAPTION_CLOSED || _non_burnt_subtitles) {
-		_writer->write (data, type, period);
+	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+		_writer->write (data, type, track, period);
 	}
 }