X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=9ceb7b896515da1f983503d7aa2f0663319ef57a;hb=9c5a7319d807063c22d6bc165ee414ce82e26965;hp=47b220da7b2161869f4d35ba37bd487ba63446dc;hpb=cc3900735839ff4b0da0c046b5c606c440ba917a;p=dcpomatic.git diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 47b220da7..9ceb7b896 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -39,7 +39,6 @@ using boost::bad_lexical_cast; ImageExaminer::ImageExaminer (shared_ptr film, shared_ptr content, shared_ptr) : _film (film) , _image_content (content) - , _video_length (0) { using namespace MagickCore; Magick::Image* image = new Magick::Image (content->path(0).string()); @@ -47,9 +46,9 @@ ImageExaminer::ImageExaminer (shared_ptr film, shared_ptrstill ()) { - _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 ()); } }