Merge master; specify libdcp-1.0.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 8662f54e8f6a3fa11f482da25b423c32e0e125cb..a80297ec690b132c041aa9d643f882c6457ff168 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -41,7 +41,7 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription description
 
 BOOST_AUTO_TEST_CASE (client_server_test)
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
+       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, dcp::Size (1998, 1080), true));
        uint8_t* p = image->data()[0];
        
        for (int y = 0; y < 1080; ++y) {
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                p += image->stride()[0];
        }
 
-       shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
+       shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, dcp::Size (100, 200), true));
        p = sub_image->data()[0];
        for (int y = 0; y < 200; ++y) {
                uint8_t* q = p;
@@ -79,6 +79,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                        ColourConversion (),
                        24,
                        200000000,
+                       RESOLUTION_2K,
                        log
                        )
                );
@@ -86,7 +87,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
        shared_ptr<EncodedData> locally_encoded = frame->encode_locally ();
        BOOST_ASSERT (locally_encoded);
        
-       Server* server = new Server (log);
+       Server* server = new Server (log, true);
 
        new thread (boost::bind (&Server::run, server, 2));