Merge master and multifarious hackery.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e5229b5ffa1794485d21d7b221507846c54c5d5f..9c4482d3c0957fcdb001ec6327cccf6d1eb964a7 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -71,7 +71,6 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                        Scaler::from_id ("bicubic"),
                        0,
                        24,
-                       "",
                        0,
                        200000000,
                        log
@@ -86,7 +85,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
        new thread (boost::bind (&Server::run, server, 2));
 
        /* Let the server get itself ready */
-       dvdomatic_sleep (1);
+       dcpomatic_sleep (1);
 
        ServerDescription description ("localhost", 2);