X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=84b0b75c9732a4cd47dc30e1698ee1a82335c675;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=3b87fcf008c4372114e77009e424dbdd30dd5cf6;hpb=a4afc8e3dd6ce7c5f02d0eb69f03bf9f043afed0;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 3b87fcf00..84b0b75c9 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -20,16 +20,17 @@
 #include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
-#include "config.h"
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
+#include "frame_rate_change.h"
+#include "exceptions.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -54,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)
 {
@@ -108,13 +109,11 @@ ImageContent::examine (shared_ptr<Job> job)
 	assert (film);
 	
 	shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
-
 	take_from_video_examiner (examiner);
-	set_video_length (examiner->video_length ());
 }
 
 void
-ImageContent::set_video_length (VideoContent::Frame len)
+ImageContent::set_video_length (ContentTime len)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -124,22 +123,20 @@ 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_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
 ImageContent::identifier () const
 {
-	stringstream s;
+	SafeStringStream s;
 	s << VideoContent::identifier ();
-	s << "_" << video_length();
+	s << "_" << video_length().get();
 	return s.str ();
 }