X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fclient_server_test.cc;h=3ab1c36e177bdfde558264202e9405dcbf8d3285;hb=cf7af490abb124631a775f5031f43ed58c0c1e4a;hp=b3d57e8139c0cc0dd244b1e49e602f449332404b;hpb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index b3d57e813..3ab1c36e1 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -50,7 +50,7 @@ void
 do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
 {
 	Data remotely_encoded;
-	BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
+	BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 1200));
 
 	BOOST_REQUIRE_EQUAL (locally_encoded.size(), remotely_encoded.size());
 	BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			)
 		);
 
-	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+	pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
 
 	shared_ptr<DCPVideo> frame (
 		new DCPVideo (
@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 	dcpomatic_sleep (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
-	EncodeServerDescription description ("127.0.0.1", 1);
+	EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			)
 		);
 
-	pvf->set_subtitle (PositionImage (sub_image, Position<int> (50, 60)));
+	pvf->set_text (PositionImage (sub_image, Position<int> (50, 60)));
 
 	shared_ptr<DCPVideo> frame (
 		new DCPVideo (
@@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 	dcpomatic_sleep (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
-	EncodeServerDescription description ("127.0.0.1", 2);
+	EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {
@@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 	dcpomatic_sleep (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
-	EncodeServerDescription description ("127.0.0.1", 2);
+	EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {