Basics of splitting up Decoder tree like Content.

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

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 13ffea13deb1a734ac4be925fa779c1abe53712e..862baffee9aa9cfa381449680d51b972e9091dcf 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
@@ -17,30 +17,26 @@
 
 */
 
-#include "video_decoder.h"
-
-namespace Magick {
-       class Image;
-}
+#include "decoder.h"
 
 class ImageContent;
+class Log;
+class ImageProxy;
 
-class ImageDecoder : public VideoDecoder
+class ImageDecoder : public Decoder
 {
 public:
-       ImageDecoder (boost::shared_ptr<const ImageContent>);
+       ImageDecoder (boost::shared_ptr<const ImageContent> c, boost::shared_ptr<Log> log);
 
        boost::shared_ptr<const ImageContent> content () {
                return _image_content;
        }
 
+private:
+       bool pass (Decoder::PassReason, bool);
        void seek (ContentTime, bool);
 
-private:
-       bool pass ();
-       
        boost::shared_ptr<const ImageContent> _image_content;
-       boost::shared_ptr<Image> _image;
-       ContentTime _video_position;
+       boost::shared_ptr<ImageProxy> _image;
+       Frame _video_position;
 };
-