Untested use of Frame for video/audio content lengths.

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 3f3cb1b94d71600b052d5d427a29bbfaae935ed3..0c89685313337b69e1584df648240bd0c7c3d71f 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -47,6 +47,8 @@ DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
        , _kdm_valid (false)
 {
        read_directory (p);
+       /* Default to no colour conversion for DCPs */
+       unset_colour_conversion (false);
 }
 
 DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
@@ -139,7 +141,8 @@ DCPContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
-       return DCPTime (video_length (), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
+       FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ());
+       return DCPTime::from_frames (rint (video_length () * frc.factor ()), film->video_frame_rate ());
 }
 
 string