X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=675d1eb24ecd2ee50474a99f97546f838c2edea8;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=75cee85b325e5e4d2b452463af3ca21231edd67f;hpb=6eec3fea764f2fe35723089d60c51005616905bf;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 75cee85b3..675d1eb24 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/client_server_test.cc
  *  @brief Test the server class.
- *  @ingroup specific
+ *  @ingroup feature
  *
  *  Create a test image and then encode it using the standard mechanism
  *  and also using a EncodeServer object running on localhost.  Compare the resulting
@@ -42,20 +42,20 @@
 #include <boost/thread.hpp>
 
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::optional;
-using boost::weak_ptr;
-using dcp::Data;
+using std::weak_ptr;
+using dcp::ArrayData;
 
 void
-do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, ArrayData locally_encoded)
 {
-	Data remotely_encoded;
+	ArrayData remotely_encoded;
 	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);
+	BOOST_CHECK_EQUAL (memcmp (locally_encoded.data(), remotely_encoded.data(), locally_encoded.size()), 0);
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_rgb)
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			)
 		);
 
-	Data locally_encoded = frame->encode_locally ();
+	ArrayData locally_encoded = frame->encode_locally ();
 
 	EncodeServer* server = new EncodeServer (true, 2);
 
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			)
 		);
 
-	Data locally_encoded = frame->encode_locally ();
+	ArrayData locally_encoded = frame->encode_locally ();
 
 	EncodeServer* server = new EncodeServer (true, 2);
 
@@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			)
 		);
 
-	Data raw_locally_encoded = raw_frame->encode_locally ();
+	ArrayData raw_locally_encoded = raw_frame->encode_locally ();
 
 	shared_ptr<PlayerVideo> j2k_pvf (
 		new PlayerVideo (
@@ -303,7 +303,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			)
 		);
 
-	Data j2k_locally_encoded = j2k_frame->encode_locally ();
+	ArrayData j2k_locally_encoded = j2k_frame->encode_locally ();
 
 	EncodeServer* server = new EncodeServer (true, 2);