Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index a2635236fc26014b7281ba8228133d35d7aab7b2..6e94492ad5f13b33c919a04576dc42f4881070cf 100644 (file)
--- 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,18 +18,23 @@
 */
 
 #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;
 
-private:       
+private:
        Magick::Blob _blob;
        mutable boost::shared_ptr<Image> _image;
+       mutable boost::mutex _mutex;
 };