X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=75ccb6a3e91fd3e21207ce26872f69f187b95170;hp=7058ea3b282935c2a9265660500190ae770bd8d2;hb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;hpb=5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 7058ea3b2..75ccb6a3e 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -36,23 +36,22 @@ using boost::shared_ptr;
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
 	: _film (film)
 	, _image_content (content)
-	, _video_length (0)
 {
 #ifdef DCPOMATIC_IMAGE_MAGICK	
 	using namespace MagickCore;
 #endif	
 	Magick::Image* image = new Magick::Image (content->path(0).string());
-	_video_size = libdcp::Size (image->columns(), image->rows());
+	_video_size = dcp::Size (image->columns(), image->rows());
 	delete image;
 
 	if (content->still ()) {
-		_video_length = Config::instance()->default_still_length() * video_frame_rate();
+		_video_length = ContentTime::from_seconds (Config::instance()->default_still_length());
 	} else {
-		_video_length = _image_content->number_of_paths ();
+		_video_length = ContentTime::from_frames (_image_content->number_of_paths (), video_frame_rate ());
 	}
 }
 
-libdcp::Size
+dcp::Size
 ImageExaminer::video_size () const
 {
 	return _video_size.get ();