X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=a3aecbcf774859dc2667e608a231045d4ab9470b;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=1800f1ea36e18921500924740f86de0948c98b8d;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h index 1800f1ea3..a3aecbcf7 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 @@ -19,10 +19,6 @@ #include "video_examiner.h" -namespace Magick { - class Image; -} - class ImageContent; class ImageExaminer : public VideoExaminer @@ -30,15 +26,16 @@ 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; } + bool yuv () const; private: boost::weak_ptr _film; boost::shared_ptr _image_content; boost::optional _video_size; - VideoFrame _video_length; + Frame _video_length; };