X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=e3375b98839fc99cdd158ff3d96fa03bfc99518e;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=3d16038c19fc6b10f43c933cbc5d16ff58bcf29a;hpb=ed0b3ee0c5a0ba11d3a1a1dfee8e71238bcab4bd;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 3d16038c1..e3375b988 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -40,29 +40,31 @@ using std::cout;
 using std::cerr;
 using std::string;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
-using dcp::Data;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using dcp::ArrayData;
 
 static shared_ptr<Film> film;
 static EncodeServerDescription* server;
-static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame_count = 0;
 
 void
 process_video (shared_ptr<PlayerVideo> pvf)
 {
-	shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
-	shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+	shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K));
+	shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K));
 
 	cout << "Frame " << frame_count << ": ";
 	cout.flush ();
 
 	++frame_count;
 
-	Data local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
-	Data remote_encoded;
+	ArrayData local_encoded = local->encode_locally ();
+	ArrayData remote_encoded;
 
 	string remote_error;
 	try {
@@ -81,8 +83,8 @@ process_video (shared_ptr<PlayerVideo> pvf)
 		return;
 	}
 
-	uint8_t* p = local_encoded.data().get ();
-	uint8_t* q = remote_encoded.data().get ();
+	uint8_t* p = local_encoded.data();
+	uint8_t* q = remote_encoded.data();
 	for (int i = 0; i < local_encoded.size(); ++i) {
 		if (*p++ != *q++) {
 			cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
@@ -146,7 +148,7 @@ main (int argc, char* argv[])
 		film.reset (new Film (film_dir));
 		film->read_metadata ();
 
-		shared_ptr<Player> player (new Player (film, film->playlist ()));
+		shared_ptr<Player> player (new Player(film));
 		player->Video.connect (bind (&process_video, _1));
 		while (!player->pass ()) {}
 	} catch (std::exception& e) {