X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fserver_test.cc;h=3c2ea4b36068ecbde2eae65658cc04b75d513536;hp=896517b270ae0bfc293f3505d208abb491a213fd;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=884093edac5f63d26c02d411c73dfb52376ccf8f

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 896517b27..3c2ea4b36 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -45,18 +45,18 @@ using boost::shared_ptr;
 static shared_ptr<Film> film;
 static ServerDescription* server;
 static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
-static int frame = 0;
+static int frame_count = 0;
 
 void
 process_video (shared_ptr<PlayerVideoFrame> pvf)
 {
-	shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (pvf, frame, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
-	shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf, frame, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+	shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+	shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
 
-	cout << "Frame " << frame << ": ";
+	cout << "Frame " << frame_count << ": ";
 	cout.flush ();
 
-	++frame;
+	++frame_count;
 
 	shared_ptr<EncodedData> local_encoded = local->encode_locally ();
 	shared_ptr<EncodedData> remote_encoded;
@@ -144,12 +144,10 @@ main (int argc, char* argv[])
 		film->read_metadata ();
 		
 		shared_ptr<Player> player = film->make_player ();
-		player->disable_audio ();
 
-		player->Video.connect (boost::bind (process_video, _1));
-		bool done = false;
-		while (!done) {
-			done = player->pass ();
+		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 ());
 		}
 	} catch (std::exception& e) {
 		cerr << "Error: " << e.what() << "\n";