X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=df854f9f3efec8bbb364e0ecbec2aedcb2fe7037;hp=3ab1c36e177bdfde558264202e9405dcbf8d3285;hb=d0555983d175e76585b2409d982e09f444eab391;hpb=ebc29bddd5cbc5cad23cc9b1095d842f55ece5e0

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 3ab1c36e1..df854f9f3 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>
 
@@ -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 (
@@ -96,6 +97,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion(),
+			VIDEO_RANGE_FULL,
 			weak_ptr<Content>(),
 			optional<Frame>()
 			)
@@ -109,19 +111,18 @@ 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));
 
 	/* Let the server get itself ready */
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
 	EncodeServerDescription description ("127.0.0.1", 1, SERVER_LINK_VERSION);
@@ -169,7 +170,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 (
@@ -181,6 +182,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion(),
+			VIDEO_RANGE_FULL,
 			weak_ptr<Content>(),
 			optional<Frame>()
 			)
@@ -194,19 +196,18 @@ 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));
 
 	/* Let the server get itself ready */
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
 	EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);
@@ -241,7 +242,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 (
@@ -253,6 +254,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			EYES_BOTH,
 			PART_WHOLE,
 			ColourConversion(),
+			VIDEO_RANGE_FULL,
 			weak_ptr<Content>(),
 			optional<Frame>()
 			)
@@ -264,12 +266,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 (
@@ -281,6 +282,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 			EYES_BOTH,
 			PART_WHOLE,
 			PresetColourConversion::all().front().conversion,
+			VIDEO_RANGE_FULL,
 			weak_ptr<Content>(),
 			optional<Frame>()
 			)
@@ -292,19 +294,18 @@ 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));
 
 	/* Let the server get itself ready */
-	dcpomatic_sleep (1);
+	dcpomatic_sleep_seconds (1);
 
 	/* "localhost" rather than "127.0.0.1" here fails on docker; go figure */
 	EncodeServerDescription description ("127.0.0.1", 2, SERVER_LINK_VERSION);