X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=d7b37a8353fa5f04b63c58006a2a6c8eade95a1f;hb=b666a794a130386bc01ede2143ef40bd6973eb32;hp=fd0b578943639a0871b529f2df2cd90947e110a6;hpb=3753cb8685e1755b067676345a5871db24149d0f;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index fd0b57894..d7b37a835 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -110,7 +110,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);
@@ -120,14 +120,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);
-	
-	FrameRateConversion frc (video_frame_rate(), film->video_frame_rate ());
-	return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
+	return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 string
@@ -135,7 +133,7 @@ ImageContent::identifier () const
 {
 	stringstream s;
 	s << VideoContent::identifier ();
-	s << "_" << video_length();
+	s << "_" << video_length().get();
 	return s.str ();
 }