Apply the remainder of a 1.x patch; a test.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 184dde9b8512904e0a49ef3e6e27d89ff9cf7565..daa1fa20f37ba469a3f99f26eb315095a115276e 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -33,12 +33,13 @@
 #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,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);