X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=004b89e659d47ebd24cb594bc06848d2651585d4;hb=a5139de256c287459e04c75712614b2e7246a89a;hp=4cba788bdd5bb900a6436e4325092a86777a1e06;hpb=09806bc8d6a48fc79d923ec1cdf6f90176bf8b6a;p=dcpomatic.git diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index 4cba788bd..004b89e65 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,6 @@ */ #include -#include #include #include "image_content.h" #include "image_examiner.h" @@ -33,8 +32,6 @@ using std::cout; using std::list; using std::sort; using boost::shared_ptr; -using boost::lexical_cast; -using boost::bad_lexical_cast; ImageExaminer::ImageExaminer (shared_ptr film, shared_ptr content, shared_ptr) : _film (film) @@ -46,9 +43,9 @@ ImageExaminer::ImageExaminer (shared_ptr film, shared_ptrstill ()) { - _video_length = ContentTime (Config::instance()->default_still_length()); + _video_length = ContentTime::from_seconds (Config::instance()->default_still_length()); } else { - _video_length = ContentTime (double (_image_content->number_of_paths ()) / video_frame_rate ()); + _video_length = ContentTime::from_frames (_image_content->number_of_paths (), video_frame_rate ()); } }