X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=9d81cdac18248087a9a4982c0c97fa59eedd3632;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=f4d81dfb507a5ef545c0f573542904472d023956;hpb=e194f0003b60b2607da0822485c56cd8267e78dc;p=dcpomatic.git

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index f4d81dfb5..9d81cdac1 100644
--- 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 Film>, 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 (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;
 };
-