X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fclient_server_test.cc;h=1f77f7f907cc718a0bcf61dd32b41881c9dd34c3;hp=26554e46c2c941dd92562ef7ad197687e56cd665;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=b67a3505b58ffd204ee1a2560be3026688be8f10

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 26554e46c..1f77f7f90 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,19 +22,18 @@
  *  @brief Test the server class.
  *
  *  Create a test image and then encode it using the standard mechanism
- *  and also using a Server object running on localhost.  Compare the resulting
+ *  and also using a EncodeServer object running on localhost.  Compare the resulting
  *  encoded data to check that they are the same.
  */
 
-#include "lib/server.h"
+#include "lib/encode_server.h"
 #include "lib/image.h"
 #include "lib/cross.h"
 #include "lib/dcp_video.h"
 #include "lib/player_video.h"
 #include "lib/raw_image_proxy.h"
 #include "lib/j2k_image_proxy.h"
-#include "lib/data.h"
-#include "lib/server_description.h"
+#include "lib/encode_server_description.h"
 #include "lib/file_log.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
@@ -42,12 +42,13 @@ using std::list;
 using boost::shared_ptr;
 using boost::thread;
 using boost::optional;
+using dcp::Data;
 
 void
-do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, Data locally_encoded)
+do_remote_encode (shared_ptr<DCPVideo> frame, EncodeServerDescription description, Data locally_encoded)
 {
 	Data remotely_encoded;
-	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description));
+	BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description, 60));
 
 	BOOST_CHECK_EQUAL (locally_encoded.size(), remotely_encoded.size());
 	BOOST_CHECK_EQUAL (memcmp (locally_encoded.data().get(), remotely_encoded.data().get(), locally_encoded.size()), 0);
@@ -112,14 +113,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
 
 	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-	Server* server = new Server (log, true);
+	EncodeServer* server = new EncodeServer (log, true, 2);
 
-	new thread (boost::bind (&Server::run, server, 2));
+	new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
 
-	ServerDescription description ("localhost", 2);
+	EncodeServerDescription description ("localhost", 2);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {
@@ -192,14 +193,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
 
 	Data locally_encoded = frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-	Server* server = new Server (log, true);
+	EncodeServer* server = new EncodeServer (log, true, 2);
 
-	new thread (boost::bind (&Server::run, server, 2));
+	new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
 
-	ServerDescription description ("localhost", 2);
+	EncodeServerDescription description ("localhost", 2);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {
@@ -284,14 +285,14 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k)
 
 	Data j2k_locally_encoded = j2k_frame->encode_locally (boost::bind (&Log::dcp_log, log.get(), _1, _2));
 
-	Server* server = new Server (log, true);
+	EncodeServer* server = new EncodeServer (log, true, 2);
 
-	new thread (boost::bind (&Server::run, server, 2));
+	new thread (boost::bind (&EncodeServer::run, server));
 
 	/* Let the server get itself ready */
 	dcpomatic_sleep (1);
 
-	ServerDescription description ("localhost", 2);
+	EncodeServerDescription description ("localhost", 2);
 
 	list<thread*> threads;
 	for (int i = 0; i < 8; ++i) {