Merge branch '1.0' into 1.0-seek

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 7b5b2b7eff1b3c14788616f6b1fbc23d69d313fa..91b482f4f849ba37558695d9772609fa596fff06 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -29,7 +29,7 @@ using boost::shared_ptr;
 using boost::thread;
 
 void
-do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* description, shared_ptr<EncodedData> locally_encoded)
+do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
 {
        shared_ptr<EncodedData> remotely_encoded;
        BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
@@ -75,6 +75,8 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                new DCPVideoFrame (
                        image,
                        0,
+                       EYES_BOTH,
+                       ColourConversion (),
                        24,
                        200000000,
                        log
@@ -84,7 +86,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));
 
@@ -95,7 +97,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 
        list<thread*> threads;
        for (int i = 0; i < 8; ++i) {
-               threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)));
+               threads.push_back (new thread (boost::bind (do_remote_encode, frame, description, locally_encoded)));
        }
 
        for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {