X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=daa1fa20f37ba469a3f99f26eb315095a115276e;hp=4e3ecc983a75524d20582b135ed29b73c08e2bff;hb=f2416324fdaef8d75678da751446113fbe19de8a;hpb=6de35d058821acc092d2aae75543024a97026b8a

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 4e3ecc983..daa1fa20f 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -39,6 +39,7 @@
 using std::list;
 using boost::shared_ptr;
 using boost::thread;
+using boost::optional;
 
 void
 do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
@@ -83,9 +84,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
-			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
 			DCPTime (),
 			Crop (),
+			optional<float> (),
 			dcp::Size (1998, 1080),
 			dcp::Size (1998, 1080),
 			Scaler::from_id ("bicubic"),
@@ -109,7 +111,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			)
 		);
 
-	shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+	shared_ptr<EncodedData> locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	BOOST_ASSERT (locally_encoded);
 	
 	Server* server = new Server (log, true);
@@ -166,9 +168,10 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
-			shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+			shared_ptr<ImageProxy> (new RawImageProxy (image)),
 			DCPTime (),
 			Crop (),
+			optional<float> (),
 			dcp::Size (1998, 1080),
 			dcp::Size (1998, 1080),
 			Scaler::from_id ("bicubic"),
@@ -192,7 +195,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			)
 		);
 
-	shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
+	shared_ptr<EncodedData> locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 	BOOST_ASSERT (locally_encoded);
 	
 	Server* server = new Server (log, true);