Tweak naming of KDM emails and attachments.

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

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index aab92a698cc96595407aeb64ab001ce650cbb265..9e9a01694f43bc76e82e74546019c67e28c41896 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -17,10 +17,6 @@
 
 */
 
-#include <iostream>
-#include <iomanip>
-#include <exception>
-#include <getopt.h>
 #include "lib/ratio.h"
 #include "lib/film.h"
 #include "lib/filter.h"
@@ -29,11 +25,16 @@
 #include "lib/dcp_video.h"
 #include "lib/decoder.h"
 #include "lib/exceptions.h"
-#include "lib/log.h"
+#include "lib/file_log.h"
 #include "lib/video_decoder.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
 #include "lib/data.h"
+#include "lib/server_description.h"
+#include <getopt.h>
+#include <iostream>
+#include <iomanip>
+#include <exception>
 
 using std::cout;
 using std::cerr;
@@ -49,8 +50,8 @@ static int frame_count = 0;
 void
 process_video (shared_ptr<PlayerVideo> pvf)
 {
-       shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_));
-       shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_));
+       shared_ptr<DCPVideo> local  (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+       shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
 
        cout << "Frame " << frame_count << ": ";
        cout.flush ();
@@ -76,7 +77,7 @@ process_video (shared_ptr<PlayerVideo> pvf)
                cout << "\033[0;31msizes differ\033[0m\n";
                return;
        }
-               
+
        uint8_t* p = local_encoded.data().get ();
        uint8_t* q = remote_encoded.data().get ();
        for (int i = 0; i < local_encoded.size(); ++i) {
@@ -129,7 +130,7 @@ main (int argc, char* argv[])
                        break;
                }
        }
-       
+
        if (server_host.empty() || film_dir.empty()) {
                help (argv[0]);
                exit (EXIT_FAILURE);
@@ -141,8 +142,8 @@ main (int argc, char* argv[])
                server = new ServerDescription (server_host, 1);
                film.reset (new Film (film_dir));
                film->read_metadata ();
-               
-               shared_ptr<Player> player = film->make_player ();
+
+               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) {