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/encoder.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c6cb8b9df..83baacd41 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -33,6 +33,7 @@
 #include "server_finder.h"
 #include "player.h"
 #include "player_video.h"
+#include "data.h"
 #include <libcxml/cxml.h>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
@@ -279,7 +280,7 @@ try
 	*/
 	int remote_backoff = 0;
 	shared_ptr<DCPVideo> last_dcp_video;
-	shared_ptr<Data> last_encoded;
+	optional<Data> last_encoded;
 	
 	while (true) {
 
@@ -300,7 +301,7 @@ try
 		
 		lock.unlock ();
 
-		shared_ptr<Data> encoded;
+		optional<Data> encoded;
 
 		if (last_dcp_video && vf->same (last_dcp_video)) {
 			/* We already have encoded data for the same input as this one, so take a short-cut */
@@ -344,7 +345,7 @@ try
 		last_encoded = encoded;
 
 		if (encoded) {
-			_writer->write (encoded, vf->index (), vf->eyes ());
+			_writer->write (encoded.get(), vf->index (), vf->eyes ());
 			frame_done ();
 		} else {
 			lock.lock ();
-- 
cgit v1.2.3