Rename EncodedData -> Data and trim it a bit.

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

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 9223efb3eb6642592e1fa36af82a0a266bca774f..62cc9a7b275ebe04e9308b1b4915e656c25c15d7 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,17 +25,15 @@
 #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"
 #include "lib/player_video.h"
-#include "lib/encoded_data.h"
+#include "lib/data.h"
 
 using std::cout;
 using std::cerr;
@@ -59,8 +57,8 @@ process_video (shared_ptr<PlayerVideo> pvf)
 
        ++frame_count;
 
-       shared_ptr<EncodedData> local_encoded = local->encode_locally ();
-       shared_ptr<EncodedData> remote_encoded;
+       shared_ptr<Data> local_encoded = local->encode_locally (boost::bind (&Log::dcp_log, log_.get(), _1, _2));
+       shared_ptr<Data> remote_encoded;
 
        string remote_error;
        try {
@@ -79,8 +77,8 @@ process_video (shared_ptr<PlayerVideo> pvf)
                return;
        }
                
-       uint8_t* p = local_encoded->data();
-       uint8_t* q = remote_encoded->data();
+       uint8_t* p = local_encoded->data().get ();
+       uint8_t* q = remote_encoded->data().get ();
        for (int i = 0; i < local_encoded->size(); ++i) {
                if (*p++ != *q++) {
                        cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";