X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=71bcffb2c50754460736700310ad0af8f002cb3b;hb=e9cca90a162e3e4b1db4a5e5188831beaa69d44e;hp=77d53a9e58440f56c09e2b815d50a8c05cb37074;hpb=0ff4fa6058b305476e7bc60c590acb6135c49b1c;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 77d53a9e5..71bcffb2c 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -50,19 +50,15 @@ public:
 
 	J2KImageProxy (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;
+	void write_to_socket (boost::shared_ptr<Socket>) const;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
 	bool same (boost::shared_ptr<const ImageProxy>) const;
 	int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
-	AVPixelFormat pixel_format () const {
-		return _pixel_format;
-	}
 
 	dcp::Data j2k () const {
 		return _data;
@@ -83,10 +79,12 @@ private:
 	dcp::Data _data;
 	dcp::Size _size;
 	boost::optional<dcp::Eye> _eye;
-	mutable boost::shared_ptr<dcp::OpenJPEGImage> _decompressed;
+	mutable boost::shared_ptr<Image> _image;
 	mutable boost::optional<dcp::Size> _target_size;
 	mutable boost::optional<int> _reduce;
 	AVPixelFormat _pixel_format;
 	mutable boost::mutex _mutex;
 	boost::optional<int> _forced_reduction;
+	/** true if an error occurred while decoding the JPEG2000 data, false if not */
+	mutable bool _error;
 };