Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 1392f66b9cd9b33620c73c5f78c164a66a245a2d..bb8c216e3d76bf5b2770705a7fa75f1ce930eb9e 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -18,8 +18,14 @@
 */
 
 #include "image_proxy.h"
+#include "data.h"
 #include <dcp/util.h>
 
+namespace dcp {
+       class MonoPictureFrame;
+       class StereoPictureFrame;
+}
+
 class Data;
 
 class J2KImageProxy : public ImageProxy
@@ -33,15 +39,23 @@ public:
        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;
+       /** @return true if our image is definitely the same as another, false if it is probably not */
+       virtual bool same (boost::shared_ptr<const ImageProxy>) const;
+
+       Data j2k () const {
+               return _data;
+       }
 
-       boost::shared_ptr<Data> j2k () const;
        dcp::Size size () const {
                return _size;
        }
-       
+
 private:
-       boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
-       boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;
+       friend struct client_server_test_j2k;
+
+       J2KImageProxy (Data data, dcp::Size size);
+
+       Data _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
 };