X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=937a565f33bc75eb36049d42ee2695f1e2a684be;hb=387304bc9147933b68eda2b38ba8cac0d250e87e;hp=6ae0422cbbd4477f8ac7878e05a2430b251711b0;hpb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;p=dcpomatic.git diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h index 6ae0422cb..937a565f3 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; - ContentTime 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; - ContentTime _video_length; + Frame _video_length; };