Include tidying src/lib/a-j*.h

[dcpomatic.git] / src / lib / image_examiner.h

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index 1917a23f399da90a47763d56b174c0008abf5586..792c7b4ebe84a73367f99a60a3f8f884732d34fb 100644 (file)
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -19,10 +19,6 @@
 
 #include "video_examiner.h"
 
-namespace Magick {
-       class Image;
-}
-
 class ImageContent;
 
 class ImageExaminer : public VideoExaminer
@@ -30,9 +26,9 @@ class ImageExaminer : public VideoExaminer
 public:
        ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
 
-       boost::optional<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;
        }
 
@@ -40,5 +36,5 @@ 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;
 };