X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=f159e38f98a270d6fbce7a90af74862cba105405;hb=4a4725e41bf4070969223f9c40885063c50e61d0;hp=1800f1ea36e18921500924740f86de0948c98b8d;hpb=c28b3d6f168607aca9995282b96647eb64a26dc9;p=dcpomatic.git diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h index 1800f1ea3..f159e38f9 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,9 +30,9 @@ class ImageExaminer : public VideoExaminer public: ImageExaminer (boost::shared_ptr, boost::shared_ptr, boost::shared_ptr); - float video_frame_rate () const; + boost::optional video_frame_rate () const; dcp::Size video_size () const; - VideoFrame video_length () const { + Frame video_length () const { return _video_length; } @@ -40,5 +40,5 @@ private: boost::weak_ptr _film; boost::shared_ptr _image_content; boost::optional _video_size; - VideoFrame _video_length; + Frame _video_length; };