X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=d575f9021f3e019add9753ac05c3e1b0c703222b;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=63b4c58e344f42ece958d7a58e75441d00da216c;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git

diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index 63b4c58e3..d575f9021 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -1,46 +1,44 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#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 Film>, boost::shared_ptr<const ImageContent>);
+	ImageDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const ImageContent> c);
 
-	boost::shared_ptr<const ImageContent> content () {
+	std::shared_ptr<const ImageContent> content () {
 		return _image_content;
 	}
 
-	void seek (ContentTime, bool);
+	bool pass ();
+	void seek (dcpomatic::ContentTime, bool);
 
 private:
-	bool pass ();
-	
-	boost::shared_ptr<const ImageContent> _image_content;
-	boost::shared_ptr<Image> _image;
-	VideoFrame _video_position;
-};
 
+	std::shared_ptr<const ImageContent> _image_content;
+	std::shared_ptr<ImageProxy> _image;
+	Frame _frame_video_position;
+};