X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=9ad36138746e54877cf697608a889d9f8ffdc16a;hb=2898a88b4554335439891d8198bed8c820c20396;hp=184dde9b8512904e0a49ef3e6e27d89ff9cf7565;hpb=73f52e94953848c696725defd3d7f5c4c30707e2;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 184dde9b8..9ad361387 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -31,14 +31,14 @@
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video.h"
-#include "lib/scaler.h"
 #include "lib/player_video.h"
-#include "lib/image_proxy.h"
+#include "lib/raw_image_proxy.h"
 #include "lib/encoded_data.h"
 
 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,12 +83,12 @@ 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"),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
@@ -109,7 +109,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,12 +166,12 @@ 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"),
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion ()
@@ -192,7 +192,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);