operator bool on Time is a really bad idea; removed it and fixed lots of bugs.

[dcpomatic.git] / src / lib / subrip_content.cc

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 9212add688c05b04ac7cba5ac3563211cd6a966c..bf034200d366cd532b09bfc5150e948fbc98a560 100644 (file)
--- 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
@@ -79,7 +81,7 @@ SubRipContent::as_xml (xmlpp::Node* node) const
        node->add_child("Type")->add_child_text ("SubRip");
        Content::as_xml (node);
        SubtitleContent::as_xml (node);
-       node->add_child("Length")->add_child_text (lexical_cast<string> (_length));
+       node->add_child("Length")->add_child_text (lexical_cast<string> (_length.get ()));
 }
 
 DCPTime