Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

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

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 6707f689c4e361895fa11791ac4571ca89e06151..51ffd4e9865eeafe4c9e9bd3742b37970c51d3eb 100644 (file)
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_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
@@ -17,18 +17,23 @@
 
 */
 
+#ifndef DCPOMATIC_RAW_IMAGE_PROXY_H
+#define DCPOMATIC_RAW_IMAGE_PROXY_H
+
 #include "image_proxy.h"
 
 class RawImageProxy : public ImageProxy
 {
 public:
-       RawImageProxy (boost::shared_ptr<Image>, boost::shared_ptr<Log> log);
-       RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+       RawImageProxy (boost::shared_ptr<Image>);
+       RawImageProxy (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;
        
 private:
        boost::shared_ptr<Image> _image;
 };
+
+#endif