Added some notes on DVD-o-matic's files to the manual.

[dcpomatic.git] / test / client_server_test.cc

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index e5229b5ffa1794485d21d7b221507846c54c5d5f..f3d72c2fc2d8415b7650e19c579aeaf6d52081ea 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -30,7 +30,7 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription* descriptio
 
 BOOST_AUTO_TEST_CASE (client_server_test)
 {
-       shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
+       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, libdcp::Size (1998, 1080), true));
        uint8_t* p = image->data()[0];
        
        for (int y = 0; y < 1080; ++y) {
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                p += image->stride()[0];
        }
 
-       shared_ptr<Image> sub_image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
+       shared_ptr<Image> sub_image (new Image (PIX_FMT_RGBA, libdcp::Size (100, 200), true));
        p = sub_image->data()[0];
        for (int y = 0; y < 200; ++y) {
                uint8_t* q = p;
@@ -56,23 +56,15 @@ BOOST_AUTO_TEST_CASE (client_server_test)
                p += sub_image->stride()[0];
        }
 
-       shared_ptr<Subtitle> subtitle (new Subtitle (Position (50, 60), sub_image));
+//     shared_ptr<Subtitle> subtitle (new Subtitle (Position<int> (50, 60), sub_image));
 
        shared_ptr<FileLog> log (new FileLog ("build/test/client_server_test.log"));
 
        shared_ptr<DCPVideoFrame> frame (
                new DCPVideoFrame (
                        image,
-                       subtitle,
-                       libdcp::Size (1998, 1080),
-                       0,
-                       0,
-                       1,
-                       Scaler::from_id ("bicubic"),
                        0,
                        24,
-                       "",
-                       0,
                        200000000,
                        log
                        )
@@ -86,7 +78,7 @@ BOOST_AUTO_TEST_CASE (client_server_test)
        new thread (boost::bind (&Server::run, server, 2));
 
        /* Let the server get itself ready */
-       dvdomatic_sleep (1);
+       dcpomatic_sleep (1);
 
        ServerDescription description ("localhost", 2);