diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 22:44:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 27b83475435dda4e84a90cf59a52f150905c4ab1 (patch) | |
| tree | 51d0158c7a879f6b2f3c40843c5e5e455069a1dc /src/lib/dcp_decoder.cc | |
| parent | 9cb73fbc0fa4643612f01665bc6d9fc430656f32 (diff) | |
Clean up after previous commit.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 6a9de841d..cc415629b 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -24,7 +24,7 @@ #include "video_decoder.h" #include "audio_decoder.h" #include "j2k_image_proxy.h" -#include "text_decoder.h" +#include "caption_decoder.h" #include "image.h" #include "config.h" #include <dcp/dcp.h> @@ -62,9 +62,9 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo if (c->audio) { audio.reset (new AudioDecoder (this, c->audio, log, fast)); } - if (c->subtitle) { + if (c->caption) { /* XXX: this time here should be the time of the first subtitle, not 0 */ - subtitle.reset (new TextDecoder (this, c->subtitle, log, ContentTime())); + caption.reset (new CaptionDecoder (this, c->caption, log, ContentTime())); } list<shared_ptr<dcp::CPL> > cpl_list = cpls (); @@ -209,7 +209,7 @@ DCPDecoder::pass_subtitles (ContentTime next) if (is) { list<dcp::SubtitleString> s; s.push_back (*is); - subtitle->emit_plain ( + caption->emit_plain ( ContentTimePeriod ( ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->in().as_seconds ()), ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->out().as_seconds ()) |