X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmagick_image_proxy.h;h=8fc00b0de31131dfd84a7f166f1c0da680112747;hb=1c45aa5806a0891025eb4729b9e0c8cfb9c68e44;hp=8b43d0a000233c051613e5b14f0ea2247716fe34;hpb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;p=dcpomatic.git

diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index 8b43d0a00..8fc00b0de 100644
--- a/src/lib/magick_image_proxy.h
+++ b/src/lib/magick_image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -18,19 +18,24 @@
 */
 
 #include "image_proxy.h"
+#include <Magick++.h>
+#include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
 
 class MagickImageProxy : public ImageProxy
 {
 public:
-	MagickImageProxy (boost::filesystem::path, boost::shared_ptr<Log> log);
-	MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+	MagickImageProxy (boost::filesystem::path);
+	MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	boost::shared_ptr<Image> image () const;
+	boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy> other) const;
+	AVPixelFormat pixel_format () const;
 
-private:	
+private:
 	Magick::Blob _blob;
 	mutable boost::shared_ptr<Image> _image;
+	mutable boost::mutex _mutex;
 };