X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=cb3d49f3135dd0e722114049e660f079508ece7d;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=fdfceb567c7d0651d25aede2c0212a8f662b182a;hpb=6c19b21e12f73ce63edd406ea617ff25bcc9bfea;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index fdfceb567..cb3d49f31 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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,7 +22,7 @@
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/util.h"
-#include "lib/server.h"
+#include "lib/encode_server.h"
 #include "lib/dcp_video.h"
 #include "lib/decoder.h"
 #include "lib/exceptions.h"
@@ -29,7 +30,7 @@
 #include "lib/video_decoder.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
-#include "lib/server_description.h"
+#include "lib/encode_server_description.h"
 #include <getopt.h>
 #include <iostream>
 #include <iomanip>
@@ -40,10 +41,11 @@ using std::cerr;
 using std::string;
 using std::pair;
 using boost::shared_ptr;
+using boost::optional;
 using dcp::Data;
 
 static shared_ptr<Film> film;
-static ServerDescription* server;
+static EncodeServerDescription* server;
 static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
 static int frame_count = 0;
 
@@ -100,7 +102,7 @@ help (string n)
 int
 main (int argc, char* argv[])
 {
-	string film_dir;
+	boost::filesystem::path film_dir;
 	string server_host;
 
 	while (true) {
@@ -131,7 +133,7 @@ main (int argc, char* argv[])
 		}
 	}
 
-	if (server_host.empty() || film_dir.empty()) {
+	if (server_host.empty() || film_dir.string().empty()) {
 		help (argv[0]);
 		exit (EXIT_FAILURE);
 	}
@@ -139,7 +141,7 @@ main (int argc, char* argv[])
 	dcpomatic_setup ();
 
 	try {
-		server = new ServerDescription (server_host, 1);
+		server = new EncodeServerDescription (server_host, 1);
 		film.reset (new Film (film_dir));
 		film->read_metadata ();