Merge master.

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

diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 11cba0f66ed39093f87ecdc5937ef29ad663489d..9524cf96baa8fa4b55f6650681e3d69bdfa939c2 100644 (file)
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -50,9 +50,11 @@ SubRipContent::examine (boost::shared_ptr<Job> job)
 {
        Content::examine (job);
        SubRip s (shared_from_this ());
-       boost::mutex::scoped_lock lm (_mutex);
        shared_ptr<const Film> film = _film.lock ();
-       _length = DCPTime (s.length (), film->active_frame_rate_change (position ()));
+       DCPTime len (s.length (), film->active_frame_rate_change (position ()));
+
+       boost::mutex::scoped_lock lm (_mutex);
+       _length = len;
 }
 
 string
@@ -81,7 +83,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