X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.h;h=7971d4a109a82d0ed8ff741a19a99088b15ffe04;hp=78b7db0c763cf1e53bbfcb188fef025012a57850;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=0ff4fa6058b305476e7bc60c590acb6135c49b1c

diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 78b7db0c7..7971d4a10 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -29,15 +29,13 @@ public:
 	explicit RawImageProxy (boost::shared_ptr<Image>);
 	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	std::pair<boost::shared_ptr<Image>, int> image (
-		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+	Result image (
 		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
 		) const;
 
 	void add_metadata (xmlpp::Node *) const;
-	void send_binary (boost::shared_ptr<Socket>) const;
+	void write_to_socket (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy>) const;
-	AVPixelFormat pixel_format () const;
 	size_t memory_used () const;
 
 private: