Reasonably straightforward stuff; main things are adding

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 242f69477826a499d915505cd0b9486808aba68d..9d81cdac18248087a9a4982c0c97fa59eedd3632 100644 (file)
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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,28 +19,22 @@
 
 #include "video_decoder.h"
 
-namespace Magick {
-       class Image;
-}
-
 class ImageContent;
 
 class ImageDecoder : public VideoDecoder
 {
 public:
-       ImageDecoder (boost::shared_ptr<const ImageContent> c);
+       ImageDecoder (boost::shared_ptr<const ImageContent> c, boost::shared_ptr<Log> log);
 
        boost::shared_ptr<const ImageContent> content () {
                return _image_content;
        }
 
+private:
+       bool pass (PassReason, bool);
        void seek (ContentTime, bool);
 
-private:
-       bool pass ();
-       
        boost::shared_ptr<const ImageContent> _image_content;
        boost::shared_ptr<ImageProxy> _image;
-       VideoFrame _video_position;
+       Frame _video_position;
 };
-