diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 21:33:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 11fe3ab56ad59b8b5525fa795d44d2323ef6d5b8 (patch) | |
| tree | 3bd7b96fee95bf6b34acdfbfdb47c92bfb5c818b /src/lib/dcp_encoder.cc | |
| parent | 0ab83642f0c96ae2681beae04873b3226338a570 (diff) | |
Get types into ReelWriter.
Diffstat (limited to 'src/lib/dcp_encoder.cc')
| -rw-r--r-- | src/lib/dcp_encoder.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc index c38d73276..cfc7da903 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 (PlayerText data, DCPTimePeriod period) +DCPEncoder::text (PlayerText 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); } } |