X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=592a7e294fe2c55caa10804515d17a6de46f81b8;hb=ec97893127a2d59871d92c9e658b6b1ab3100b40;hp=074ca0c9e8274f888d47159490b7a1d70b10523e;hpb=9aec1f8069ab8d08d79e0021157d85991de6535e;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 074ca0c9e..592a7e294 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -43,6 +43,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
+using boost::weak_ptr;
 using dcp::Data;
 
 void
@@ -94,11 +95,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			dcp::Size (1998, 1080),
 			EYES_BOTH,
 			PART_WHOLE,
-			ColourConversion ()
+			ColourConversion(),
+			weak_ptr<Content>(),
+			optional<Frame>()
 			)
 		);
 
-	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 (
@@ -121,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) {
@@ -177,11 +180,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			dcp::Size (1998, 1080),
 			EYES_BOTH,
 			PART_WHOLE,
-			ColourConversion ()
+			ColourConversion(),
+			weak_ptr<Content>(),
+			optional<Frame>()
 			)
 		);
 
-	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 (
@@ -204,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) {
@@ -247,7 +252,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			dcp::Size (1998, 1080),
 			EYES_BOTH,
 			PART_WHOLE,
-			ColourConversion ()
+			ColourConversion(),
+			weak_ptr<Content>(),
+			optional<Frame>()
 			)
 		);
 
@@ -273,7 +280,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			dcp::Size (1998, 1080),
 			EYES_BOTH,
 			PART_WHOLE,
-			PresetColourConversion::all().front().conversion
+			PresetColourConversion::all().front().conversion,
+			weak_ptr<Content>(),
+			optional<Frame>()
 			)
 		);
 
@@ -298,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) {