Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/dcpomatic

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

diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index f0a44954ff2ee2ed88d9dcaef2de1044a7f42f09..039088862ef8bf7801af1d76da482ff85c425373 100644 (file)
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -49,8 +49,8 @@ static int frame = 0;
 void
 process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time)
 {
-       shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
-       shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
+       shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+       shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
 
        cout << "Frame " << frame << ": ";
        cout.flush ();
@@ -137,14 +137,14 @@ main (int argc, char* argv[])
 
        dcpomatic_setup ();
 
-       server = new ServerDescription (server_host, 1);
-       film.reset (new Film (film_dir));
-       film->read_metadata ();
-
-       shared_ptr<Player> player = film->make_player ();
-       player->disable_audio ();
-
        try {
+               server = new ServerDescription (server_host, 1);
+               film.reset (new Film (film_dir));
+               film->read_metadata ();
+               
+               shared_ptr<Player> player = film->make_player ();
+               player->disable_audio ();
+
                player->Video.connect (boost::bind (process_video, _1, _2, _3, _5));
                bool done = false;
                while (!done) {