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 0154200ad054c5a5ff1a024c76cf7c6ec56e06c8..daa1fa20f37ba469a3f99f26eb315095a115276e 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -84,7 +84,7 @@ 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> (),
@@ -111,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);
@@ -168,7 +168,7 @@ 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> (),
@@ -195,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);