Merge master.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index eab84cc397cb32684b55c5d56ebf57514cd98bc7..0154200ad054c5a5ff1a024c76cf7c6ec56e06c8 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -33,11 +33,13 @@
 #include "lib/dcp_video.h"
 #include "lib/scaler.h"
 #include "lib/player_video.h"
-#include "lib/image_proxy.h"
+#include "lib/raw_image_proxy.h"
+#include "lib/encoded_data.h"
 
 using std::list;
 using boost::shared_ptr;
 using boost::thread;
+using boost::optional;
 
 void
 do_remote_encode (shared_ptr<DCPVideo> frame, ServerDescription description, shared_ptr<EncodedData> locally_encoded)
@@ -83,7 +85,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
                        shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+                       DCPTime (),
                        Crop (),
+                       optional<float> (),
                        dcp::Size (1998, 1080),
                        dcp::Size (1998, 1080),
                        Scaler::from_id ("bicubic"),
@@ -102,6 +106,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
                        24,
                        200000000,
                        RESOLUTION_2K,
+                       true,
                        log
                        )
                );
@@ -164,7 +169,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
        shared_ptr<PlayerVideo> pvf (
                new PlayerVideo (
                        shared_ptr<ImageProxy> (new RawImageProxy (image, log)),
+                       DCPTime (),
                        Crop (),
+                       optional<float> (),
                        dcp::Size (1998, 1080),
                        dcp::Size (1998, 1080),
                        Scaler::from_id ("bicubic"),
@@ -183,6 +190,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
                        24,
                        200000000,
                        RESOLUTION_2K,
+                       true,
                        log
                        )
                );