X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=9766aad337e0cea449bc7ba7c262bf7f82ae7ca4;hp=9121e9d53243551db4a5530cd27760221dcb155e;hb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 9121e9d53..9766aad33 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -61,7 +61,7 @@ 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_subtitle_connection = _player->Subtitle.connect (bind (&DCPEncoder::subtitle, this, _1, _2));
+	_player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3));
 
 	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
 		if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
@@ -75,7 +75,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
@@ -141,10 +141,10 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
+DCPEncoder::text (PlayerCaption data, TextType type, DCPTimePeriod period)
 {
-	if (_non_burnt_subtitles) {
-		_writer->write (data, period);
+	if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+		_writer->write (data, type, period);
 	}
 }