Use a struct rather than a std::pair as the return type from ImageProxy::image.

[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 78b7db0c763cf1e53bbfcb188fef025012a57850..a247d7610b4489b2198e24c5cffb4127eb14bf6c 100644 (file)
--- 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;
        bool same (boost::shared_ptr<const ImageProxy>) const;
-       AVPixelFormat pixel_format () const;
        size_t memory_used () const;
 
 private: