diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:22:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:22:47 +0000 |
| commit | 1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33 (patch) | |
| tree | d60b9fb573dd8d6ab89036fb8788cd1b1c69aada /src/lib/subrip_content.cc | |
| parent | 6d8bcba724be622739a749064466901486304cee (diff) | |
New DCPTime/ContentTime types.
Diffstat (limited to 'src/lib/subrip_content.cc')
| -rw-r--r-- | src/lib/subrip_content.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc index 9212add68..11cba0f66 100644 --- a/src/lib/subrip_content.cc +++ b/src/lib/subrip_content.cc @@ -20,6 +20,7 @@ #include "subrip_content.h" #include "util.h" #include "subrip.h" +#include "film.h" #include "i18n.h" @@ -39,7 +40,7 @@ SubRipContent::SubRipContent (shared_ptr<const Film> film, boost::filesystem::pa SubRipContent::SubRipContent (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node, int version) : Content (film, node) , SubtitleContent (film, node, version) - , _length (node->number_child<DCPTime> ("Length")) + , _length (node->number_child<int64_t> ("Length")) { } @@ -50,7 +51,8 @@ SubRipContent::examine (boost::shared_ptr<Job> job) Content::examine (job); SubRip s (shared_from_this ()); boost::mutex::scoped_lock lm (_mutex); - _length = s.length (); + shared_ptr<const Film> film = _film.lock (); + _length = DCPTime (s.length (), film->active_frame_rate_change (position ())); } string |