X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=99a6b4cafedf4d02b74bb48a5d3f8dc7837ce709;hp=3fa7ebb6042ed999c1ca96a50a520b3dee82f043;hb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;hpb=de2af791bdfdcd653752cba970e59efc7bf810c7

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 3fa7ebb60..99a6b4caf 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -43,25 +43,27 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::Data;
 
 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 local_encoded = local->encode_locally ();
 	Data remote_encoded;
 
 	string remote_error;
@@ -142,11 +144,11 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	try {
-		server = new EncodeServerDescription (server_host, 1);
+		server = new EncodeServerDescription (server_host, 1, SERVER_LINK_VERSION);
 		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) {