X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=9ceb7b896515da1f983503d7aa2f0663319ef57a;hb=9c5a7319d807063c22d6bc165ee414ce82e26965;hp=12fe2b8a61d757f4c561bb4bcd867782d13edfdf;hpb=e8204f55c981493b99814f71a50b3c3d62601032;p=dcpomatic.git

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 12fe2b8a6..9ceb7b896 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -39,21 +39,20 @@ using boost::bad_lexical_cast;
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
 	: _film (film)
 	, _image_content (content)
-	, _video_length (0)
 {
 	using namespace MagickCore;
 	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 (double (_image_content->number_of_paths ()) / video_frame_rate ());
 	}
 }
 
-libdcp::Size
+dcp::Size
 ImageExaminer::video_size () const
 {
 	return _video_size.get ();