std::shared_ptr

[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 5711b54f2f9f362a0ec9a178994d3010af0269e5..7cd9491fa25181da37a3a570a2f80a1723fefc6c 100644 (file)
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -26,21 +26,20 @@
 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 (
                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