Primitive subtitle export feature.

[dcpomatic.git] / src / lib / dcp_encoder.cc

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 42984887daa029dc48e6f06c766d6809ddcc8c95..448fc2a5298e4e506f99c52cef110ec5bbaf21e5 100644 (file)
--- 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.
 
@@ -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<TextContent> 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,18 +145,18 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 }
 
 void
-DCPEncoder::caption (PlayerText data, TextType 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);
        }
 }
 
-float
+optional<float>
 DCPEncoder::current_rate () const
 {
        if (!_j2k_encoder) {
-               return 0;
+               return optional<float>();
        }
 
        return _j2k_encoder->current_encoding_rate ();