Fix deadlock.

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

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 7ff28e174ec092afdbc832ec6b07fb40c7f47c37..39cbda27d85e4572c99480b0b921064775e10099 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -24,14 +24,15 @@
  *  @brief ImageProxy and subclasses.
  */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
+#include <dcp/types.h>
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
 
 class Image;
 class Socket;
-class Log;
 
 namespace cxml {
        class Node;
@@ -56,22 +57,18 @@ namespace dcp {
 class ImageProxy : public boost::noncopyable
 {
 public:
-       ImageProxy (boost::shared_ptr<Log> log);
        virtual ~ImageProxy () {}
 
        /** @return Image (which must be aligned) */
-       virtual boost::shared_ptr<Image> image () const = 0;
+       virtual boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const = 0;
        virtual void add_metadata (xmlpp::Node *) const = 0;
        virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
        /** @return true if our image is definitely the same as another, false if it is probably not */
        virtual bool same (boost::shared_ptr<const ImageProxy>) const {
                return false;
        }
-
-protected:
-       boost::shared_ptr<Log> _log;
 };
 
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
 #endif