X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=f3d72c2fc2d8415b7650e19c579aeaf6d52081ea;hb=44555d6be9043c00030050caf9b49cd0241730c9;hp=51b52331af8c84c938132f29d86ebef06cab4d6b;hpb=883d885dc8690519d205c8baa275385af8a39f4b;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 51b52331a..f3d72c2fc 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -30,7 +30,7 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* descriptio
 
 BOOST_AUTO_TEST_CASE (client_server_test)
 {
-	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
+	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
 	uint8_t* p = image->data()[0];
 	
 	for (int y = 0; y < 1080; ++y) {
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		p += image->stride()[0];
 	}
 
-	shared_ptr<Image> sub_image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
+	shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
 	p = sub_image->data()[0];
 	for (int y = 0; y < 200; ++y) {
 		uint8_t* q = p;
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 		p += sub_image->stride()[0];
 	}
 
-	shared_ptr<Subtitle> subtitle (new Subtitle (Position (50, 60), sub_image));
+//	shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
 
 	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
@@ -65,7 +65,6 @@ BOOST_AUTO_TEST_CASE (client_server_test)
 			image,
 			0,
 			24,
-			0,
 			200000000,
 			log
 			)