X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip_content.cc;h=11cba0f66ed39093f87ecdc5937ef29ad663489d;hb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;hp=9212add688c05b04ac7cba5ac3563211cd6a966c;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git

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