X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=2713280b4b7c83b1cc6d0560ab82fd89657abcd3;hb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;hp=0f952607159f99e4da16b6990f7efac0a32a541b;hpb=521c09170d9e62cd72cc2da66c41816761008a4b;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 0f9526071..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 (VideoContent::Frame 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
@@ -144,3 +142,19 @@ ImageContent::still () const
 {
 	return number_of_paths() == 1;
 }
+
+void
+ImageContent::set_video_frame_rate (float r)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		if (_video_frame_rate == r) {
+			return;
+		}
+		
+		_video_frame_rate = r;
+	}
+	
+	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+}
+