X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=3fa7ebb6042ed999c1ca96a50a520b3dee82f043;hb=4f9cb03792e85cbb5b4d554ab8ec0a3275fa7524;hp=5e50df227ed703f87d229005e861d418df00c630;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 5e50df227..3fa7ebb60 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -41,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;
@@ -101,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) {
@@ -132,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);
 	}
@@ -145,11 +147,8 @@ main (int argc, char* argv[])
 		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";
 	}