Bump server link version.

[dcpomatic.git] / src / lib / image_proxy.h

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index b377d5362928e03bacbae8856ee69ba76a5f37c2..1d57b4e08e27b746b38fdd2c4e9584ac4e66d4a8 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -60,15 +60,35 @@ class ImageProxy : public boost::noncopyable
 public:
        virtual ~ImageProxy () {}
 
-       /** @param note Handler for any notes that occur.
+       struct Result {
+               Result (boost::shared_ptr<Image> image_, int log2_scaling_)
+                       : image (image_)
+                       , log2_scaling (log2_scaling_)
+                       , error (false)
+               {}
+
+               Result (boost::shared_ptr<Image> image_, int log2_scaling_, bool error_)
+                       : image (image_)
+                       , log2_scaling (log2_scaling_)
+                       , error (error_)
+               {}
+
+               /** Image (which will be aligned) */
+               boost::shared_ptr<Image> image;
+               /** log2 of any scaling down that has already been applied to the image;
+                *  e.g. if the image is already half the size of the original, this value
+                *  will be 1.
+                */
+               int log2_scaling;
+               /** true if there was an error during image decoding, otherwise false */
+               bool error;
+       };
+
+       /** @param log Log to write to, or 0.
         *  @param size Size that the returned image will be scaled to, in case this
         *  can be used as an optimisation.
-        *  @return Image (which must be aligned) and log2 of any scaling down that has
-        *  already been applied to the image; e.g. if the the image is already half the size
-        *  of the original, the second part of the return value will be 1.
         */
-       virtual std::pair<boost::shared_ptr<Image>, int> image (
-               boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+       virtual Result image (
                boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
                ) const = 0;
 
@@ -81,7 +101,6 @@ public:
         *  @return log2 of any scaling down that will be applied to the image.
         */
        virtual int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const { return 0; }
-       virtual AVPixelFormat pixel_format () const = 0;
        virtual size_t memory_used () const = 0;
 };