diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-28 23:34:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-29 11:58:06 +0100 |
| commit | 1db0293ad36605da9ca8daa8736ef581f4f6a34e (patch) | |
| tree | fb613032d7f8a1712cf10f99ebbf6215e4145c5a /src/lib/dcp_encoder.cc | |
| parent | ec97893127a2d59871d92c9e658b6b1ab3100b40 (diff) | |
Basics of splitting CCAP streams into different assets.
Diffstat (limited to 'src/lib/dcp_encoder.cc')
| -rw-r--r-- | src/lib/dcp_encoder.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc index 7fbbb2c63..50a8fd927 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. @@ -49,6 +49,7 @@ using std::list; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; +using boost::optional; /** Construct a DCP encoder. * @param film Film that we are encoding. @@ -61,7 +62,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_text_connection = _player->Text.connect (bind (&DCPEncoder::text, 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->text) { @@ -143,10 +144,10 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time) } void -DCPEncoder::text (PlayerText data, TextType type, DCPTimePeriod period) +DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period) { if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) { - _writer->write (data, type, period); + _writer->write (data, type, track, period); } } |