diff options
Diffstat (limited to 'src/lib/image_examiner.cc')
| -rw-r--r-- | src/lib/image_examiner.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc index ef9c13c5a..d6c7d0502 100644 --- a/src/lib/image_examiner.cc +++ b/src/lib/image_examiner.cc @@ -34,6 +34,7 @@ using std::cout; using std::list; using std::sort; using boost::shared_ptr; +using boost::optional; ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>) : _film (film) @@ -63,7 +64,9 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag if (content->still ()) { _video_length = ContentTime::from_seconds (Config::instance()->default_still_length()); } else { - _video_length = ContentTime::from_frames (_image_content->number_of_paths (), video_frame_rate ()); + _video_length = ContentTime::from_frames ( + _image_content->number_of_paths (), video_frame_rate().get_value_or (0) + ); } } @@ -73,13 +76,9 @@ ImageExaminer::video_size () const return _video_size.get (); } -float +optional<float> ImageExaminer::video_frame_rate () const { - boost::shared_ptr<const Film> f = _film.lock (); - if (!f) { - return 24; - } - - return f->video_frame_rate (); + /* Don't know */ + return optional<float> (); } |