From 1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 4 Mar 2014 20:22:47 +0000
Subject: New DCPTime/ContentTime types.

---
 src/lib/image_content.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/lib/image_content.cc')

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index a7f951bea..2713280b4 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 (VideoFrame len)
+ImageContent::set_video_length (ContentTime len)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -125,9 +125,7 @@ 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() * frc.factor() * TIME_HZ / video_frame_rate();
+	return DCPTime (video_length(), FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 string
-- 
cgit v1.2.3