diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-09 00:30:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-09 00:30:08 +0100 |
| commit | 3e7b4caf9be417bc1c80f1389d01e9dc98a25f21 (patch) | |
| tree | 714072185cfe525e716d752869748856e1b77f2d /src/lib/dcp_subtitle_decoder.cc | |
| parent | a0a34108fbab331ed25c3f1291b8fcfadec6407e (diff) | |
| parent | 89b3ab9210af0888f7b4ce558869051a731d17e2 (diff) | |
Merge.
Diffstat (limited to 'src/lib/dcp_subtitle_decoder.cc')
| -rw-r--r-- | src/lib/dcp_subtitle_decoder.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc index 93a122590..95d7bdca4 100644 --- a/src/lib/dcp_subtitle_decoder.cc +++ b/src/lib/dcp_subtitle_decoder.cc @@ -19,7 +19,7 @@ #include "dcp_subtitle_decoder.h" #include "dcp_subtitle_content.h" -#include <dcp/interop_subtitle_content.h> +#include <dcp/interop_subtitle_asset.h> using std::list; using std::cout; @@ -28,7 +28,7 @@ using boost::shared_ptr; DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content) : SubtitleDecoder (content) { - shared_ptr<dcp::SubtitleContent> c (load (content->path (0))); + shared_ptr<dcp::SubtitleAsset> c (load (content->path (0))); _subtitles = c->subtitles (); _next = _subtitles.begin (); } @@ -40,7 +40,7 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate) _next = _subtitles.begin (); list<dcp::SubtitleString>::const_iterator i = _subtitles.begin (); - while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().to_seconds()) < time) { + while (i != _subtitles.end() && ContentTime::from_seconds (_next->in().as_seconds()) < time) { ++i; } } @@ -75,8 +75,8 @@ DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) c for (list<dcp::SubtitleString>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) { ContentTimePeriod period ( - ContentTime::from_seconds (i->in().to_seconds ()), - ContentTime::from_seconds (i->out().to_seconds ()) + ContentTime::from_seconds (i->in().as_seconds ()), + ContentTime::from_seconds (i->out().as_seconds ()) ); if ((starting && p.contains (period.from)) || (!starting && p.overlaps (period))) { |