X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.h;h=792c7b4ebe84a73367f99a60a3f8f884732d34fb;hb=bf66dd3832c1f25818b05c7b9f90a7e99ca4375b;hp=f5d5150749971c6f874880802e1da1ff09b96555;hpb=8353a009aae1a604251c0160193c39741c2fa27c;p=dcpomatic.git

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index f5d515074..792c7b4eb 100644
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -1,5 +1,5 @@
 /*
-    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
     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,15 @@ 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;
-	libdcp::Size video_size () const;
-	VideoFrame video_length () const {
+	boost::optional<double> video_frame_rate () const;
+	dcp::Size video_size () const;
+	Frame video_length () const {
 		return _video_length;
 	}
 
 private:
 	boost::weak_ptr<const Film> _film;
 	boost::shared_ptr<const ImageContent> _image_content;
-	boost::optional<libdcp::Size> _video_size;
-	VideoFrame _video_length;
+	boost::optional<dcp::Size> _video_size;
+	Frame _video_length;
 };