X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=10286c72a256b63c9a78829f0f8f3cab8c2d60b6;hb=11efa93e15b694b8ea6f0a2bc68c87503cc570bb;hp=592a7e294fe2c55caa10804515d17a6de46f81b8;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 592a7e294..10286c72a 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,6 +36,7 @@
 #include "lib/j2k_image_proxy.h"
 #include "lib/encode_server_description.h"
 #include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
@@ -50,7 +51,7 @@ void
 do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
 {
 	Data remotely_encoded;
-	BOOST_REQUIRE_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
+	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);
@@ -84,7 +85,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 		p += sub_image->stride()[0];
 	}
 
-	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_rgb.log"));
+	dcpomatic_log.reset (new FileLog("build/test/client_server_test_rgb.log"));
 
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
@@ -109,14 +110,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			0,
 			24,
 			200000000,
-			RESOLUTION_2K,
-			log
+			RESOLUTION_2K
 			)
 		);
 
-	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+	Data locally_encoded = frame->encode_locally ();
 
-	EncodeServer* server = new EncodeServer (log, true, 2);
+	EncodeServer* server = new EncodeServer (true, 2);
 
 	thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
@@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 		p += sub_image->stride()[0];
 	}
 
-	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_yuv.log"));
+	dcpomatic_log.reset (new FileLog("build/test/client_server_test_yuv.log"));
 
 	shared_ptr<PlayerVideo> pvf (
 		new PlayerVideo (
@@ -194,14 +194,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			0,
 			24,
 			200000000,
-			RESOLUTION_2K,
-			log
+			RESOLUTION_2K
 			)
 		);
 
-	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+	Data locally_encoded = frame->encode_locally ();
 
-	EncodeServer* server = new EncodeServer (log, true, 2);
+	EncodeServer* server = new EncodeServer (true, 2);
 
 	thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));
 
@@ -241,7 +240,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 		}
 	}
 
-	shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test_j2k.log"));
+	dcpomatic_log.reset (new FileLog("build/test/client_server_test_j2k.log"));
 
 	shared_ptr<PlayerVideo> raw_pvf (
 		new PlayerVideo (
@@ -264,12 +263,11 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			0,
 			24,
 			200000000,
-			RESOLUTION_2K,
-			log
+			RESOLUTION_2K
 			)
 		);
 
-	Data raw_locally_encoded = raw_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+	Data raw_locally_encoded = raw_frame->encode_locally ();
 
 	shared_ptr<PlayerVideo> j2k_pvf (
 		new PlayerVideo (
@@ -292,14 +290,13 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			0,
 			24,
 			200000000,
-			RESOLUTION_2K,
-			log
+			RESOLUTION_2K
 			)
 		);
 
-	Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
+	Data j2k_locally_encoded = j2k_frame->encode_locally ();
 
-	EncodeServer* server = new EncodeServer (log, true, 2);
+	EncodeServer* server = new EncodeServer (true, 2);
 
 	thread* server_thread = new thread (boost::bind (&EncodeServer::run, server));