X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=c9885654bd3ae3e830c7a6f635d25d205999f8d8;hp=5711b54f2f9f362a0ec9a178994d3010af0269e5;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=72b11d5eb036651b6ff68edf3ed270e8fc52960f

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 5711b54f2..c9885654b 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,29 +18,33 @@
 
 */
 
+
 #ifndef DCPOMATIC_RAW_IMAGE_PROXY_H
 #define DCPOMATIC_RAW_IMAGE_PROXY_H
 
+
 #include "image_proxy.h"
 
+
 class RawImageProxy : public ImageProxy
 {
 public:
-	explicit RawImageProxy (boost::shared_ptr<Image>);
-	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
+	explicit RawImageProxy (std::shared_ptr<Image>);
+	RawImageProxy (std::shared_ptr<cxml::Node> xml, std::shared_ptr<Socket> socket);
 
-	std::pair<boost::shared_ptr<Image>, int> image (
-		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+	Result image (
+		Image::Alignment alignment,
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const;
 
 	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
-	bool same (boost::shared_ptr<const ImageProxy>) const;
+	void write_to_socket (std::shared_ptr<Socket>) const;
+	bool same (std::shared_ptr<const ImageProxy>) const;
 	size_t memory_used () const;
 
 private:
-	boost::shared_ptr<Image> _image;
+	std::shared_ptr<Image> _image;
 };
 
+
 #endif