From a97dffe585e8e185c57a3f1b025cffa6da9525d2 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Jun 2015 14:26:44 +0100
Subject: Tidy up J2KImageProxy a bit.

---
 src/lib/j2k_image_proxy.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/lib/j2k_image_proxy.h')

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 1392f66b9..34b1490b3 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -18,6 +18,7 @@
 */
 
 #include "image_proxy.h"
+#include "data.h"
 #include <dcp/util.h>
 
 class Data;
@@ -34,14 +35,16 @@ public:
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 
-	boost::shared_ptr<Data> j2k () const;
+	Data j2k () const {
+		return _data;
+	}
+	
 	dcp::Size size () const {
 		return _size;
 	}
 	
 private:
-	boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
-	boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;
+	Data _data;
 	dcp::Size _size;
 	boost::optional<dcp::Eye> _eye;
 };
-- 
cgit v1.2.3