X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=2e743a82e4b318b3450a0c5546d29fc97d70d3a8;hp=6ae0422cbbd4477f8ac7878e05a2430b251711b0;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h index 6ae0422cb..2e743a82e 100644 --- a/src/lib/image_examiner.h +++ b/src/lib/image_examiner.h @@ -1,28 +1,25 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "video_examiner.h" -namespace Magick { - class Image; -} - class ImageContent; class ImageExaminer : public VideoExaminer @@ -30,15 +27,19 @@ class ImageExaminer : public VideoExaminer public: ImageExaminer (boost::shared_ptr, boost::shared_ptr, boost::shared_ptr); - float video_frame_rate () const; + bool has_video () const { + return true; + } + boost::optional video_frame_rate () const; dcp::Size video_size () const; - ContentTime 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; - ContentTime _video_length; + Frame _video_length; };