X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=1917a23f399da90a47763d56b174c0008abf5586;hb=ed60129bb2051649de3740ff75a7db71db9e7897;hp=8887f0d3d15a2587f56faff713a62835b3af8a7b;hpb=bdbb254c18b100f8fa66a3707f6b515309d05685;p=dcpomatic.git diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h index 8887f0d3d..1917a23f3 100644 --- a/src/lib/image_examiner.h +++ b/src/lib/image_examiner.h @@ -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 @@ -30,15 +30,15 @@ class ImageExaminer : public VideoExaminer public: ImageExaminer (boost::shared_ptr, boost::shared_ptr, boost::shared_ptr); - float video_frame_rate () const; - libdcp::Size video_size () const; - VideoContent::Frame video_length () const { + boost::optional video_frame_rate () const; + dcp::Size video_size () const; + ContentTime video_length () const { return _video_length; } private: boost::weak_ptr _film; boost::shared_ptr _image_content; - boost::optional _video_size; - VideoContent::Frame _video_length; + boost::optional _video_size; + ContentTime _video_length; };