Various bits mostly related to colour conversions.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 50add352f392df1cf98f67c4f57706d031b854c9..7faf47c4158a72e5c86d88c37051a3b827f0cb12 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -17,8 +17,19 @@
 
 */
 
+#include <boost/test/unit_test.hpp>
+#include <boost/thread.hpp>
+#include "lib/server.h"
+#include "lib/image.h"
+#include "lib/cross.h"
+#include "lib/dcp_video_frame.h"
+
+using std::list;
+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));
@@ -64,8 +75,8 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                new DCPVideoFrame (
                        image,
                        0,
+                       EYES_BOTH,
                        24,
-                       0,
                        200000000,
                        log
                        )
@@ -85,7 +96,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) {