X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=281b002f33572c1708dfef7f42297d8b14c9a31e;hp=6ae0422cbbd4477f8ac7878e05a2430b251711b0;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=7b2054e2a73844450b5b55c5788c02af671812ce

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index 6ae0422cb..281b002f3 100644
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -1,28 +1,25 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
 #include "video_examiner.h"
 
-namespace Magick {
-	class Image;
-}
-
 class ImageContent;
 
 class ImageExaminer : public VideoExaminer
@@ -30,15 +27,16 @@ class ImageExaminer : public VideoExaminer
 public:
 	ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
 
-	float video_frame_rate () const;
+	boost::optional<double> 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<const Film> _film;
 	boost::shared_ptr<const ImageContent> _image_content;
 	boost::optional<dcp::Size> _video_size;
-	ContentTime _video_length;
+	Frame _video_length;
 };