48393469730c8fb8759cc41d50c95c26380991be from master; block possibly bad characters...

[dcpomatic.git] / src / tools / server_test.cc

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 9223efb3eb6642592e1fa36af82a0a266bca774f..f27e25fde3dab9ac53d19409a89dd0163970abfe 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,12 +25,10 @@
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/util.h"
-#include "lib/scaler.h"
 #include "lib/server.h"
 #include "lib/dcp_video.h"
 #include "lib/decoder.h"
 #include "lib/exceptions.h"
-#include "lib/scaler.h"
 #include "lib/log.h"
 #include "lib/video_decoder.h"
 #include "lib/player.h"
@@ -59,7 +57,7 @@ process_video (shared_ptr<PlayerVideo> pvf)
 
        ++frame_count;
 
-       shared_ptr<EncodedData> local_encoded = local->encode_locally ();
+       shared_ptr<EncodedData> local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
        shared_ptr<EncodedData> remote_encoded;
 
        string remote_error;