Merge master.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 6acf0bab924001eaa5b51e1d1349ce134e5e719c..8909240dc334e3d793e2ff64cc7d8b4922c8a1f1 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -55,7 +55,7 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
 }
 
 
-ImageContent::ImageContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+ImageContent::ImageContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
        : Content (f, node)
        , VideoContent (f, node, version)
 {
@@ -115,7 +115,7 @@ ImageContent::examine (shared_ptr<Job> job)
 }
 
 void
-ImageContent::set_video_length (VideoContent::Frame len)
+ImageContent::set_video_length (ContentTime len)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -125,14 +125,12 @@ ImageContent::set_video_length (VideoContent::Frame len)
        signal_changed (ContentProperty::LENGTH);
 }
 
-Time
+DCPTime
 ImageContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
-       
-       FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
-       return video_length_after_3d_combine() * frc.factor() * TIME_HZ / video_frame_rate();
+       return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 string
@@ -140,7 +138,7 @@ ImageContent::identifier () const
 {
        stringstream s;
        s << VideoContent::identifier ();
-       s << "_" << video_length();
+       s << "_" << video_length().get();
        return s.str ();
 }