X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=1111b66c09dea38b64b46189042fa030ba7cb33a;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=379c06f32786722c9e9c2c9a387a2f242fadb6f5;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 379c06f32..1111b66c0 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,25 +18,33 @@
 
 */
 
+
 #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>);
-	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);
 
-	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>) const;
-	AVPixelFormat pixel_format () const;
+	Result image (
+		Image::Alignment alignment,
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const override;
+
+	void add_metadata (xmlpp::Node *) const override;
+	void write_to_socket (std::shared_ptr<Socket>) const override;
+	bool same (std::shared_ptr<const ImageProxy>) const override;
+	size_t memory_used () const override;
 
 private:
-	boost::shared_ptr<Image> _image;
+	std::shared_ptr<Image> _image;
 };
 
+
 #endif