First cut at J2K import.

[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 1c283180201c37a18d8b04b256c8e445f5c29d1d..299180f50ceda178ad286e4d015125eab77e6874 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -20,17 +20,25 @@
 #include <dcp/util.h>
 #include "image_proxy.h"
 
+class EncodedData;
+
 class J2KImageProxy : public ImageProxy
 {
 public:
-       J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size, boost::shared_ptr<Log> log);
-       J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, boost::shared_ptr<Log> log);
-       J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket, boost::shared_ptr<Log> log);
+       J2KImageProxy (boost::filesystem::path path, dcp::Size);
+       J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size);
+       J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye);
+       J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
        boost::shared_ptr<Image> image () const;
        void add_metadata (xmlpp::Node *) const;
        void send_binary (boost::shared_ptr<Socket>) const;
 
+       boost::shared_ptr<EncodedData> j2k () const;
+       dcp::Size size () const {
+               return _size;
+       }
+       
 private:
        boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
        boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;