X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=3d16038c19fc6b10f43c933cbc5d16ff58bcf29a;hp=3307d8f5c4ea68a347d69c984406586117132a2c;hb=ed0b3ee0c5a0ba11d3a1a1dfee8e71238bcab4bd;hpb=17df947ac256397311a11894062070f8069c7e75

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 3307d8f5c..3d16038c1 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/>.
 
 */
 
@@ -40,6 +41,8 @@ using std::cerr;
 using std::string;
 using std::pair;
 using boost::shared_ptr;
+using boost::optional;
+using boost::bind;
 using dcp::Data;
 
 static shared_ptr<Film> film;
@@ -100,7 +103,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 +134,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,16 +142,13 @@ 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 ()));
-
-		DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
-		for (DCPTime t; t < film->length(); t += frame) {
-			process_video (player->get_video(t, true).front ());
-		}
+		player->Video.connect (bind (&process_video, _1));
+		while (!player->pass ()) {}
 	} catch (std::exception& e) {
 		cerr << "Error: " << e.what() << "\n";
 	}