Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index def58c5ebb3a5a7bc0e69dcccc2df31be1ed82b0..436046890bb9c709497450ac6d1e5de7d070bed0 100644 (file)
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -123,8 +123,15 @@ VideoMXFContent::full_length (shared_ptr<const Film> film) const
        return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 }
 
+DCPTime
+VideoMXFContent::approximate_length () const
+{
+       return DCPTime::from_frames (video->length_after_3d_combine(), 24);
+}
+
 void
-VideoMXFContent::add_properties (list<UserProperty>& p) const
+VideoMXFContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
+       Content::add_properties (film, p);
        video->add_properties (p);
 }