Use less vertical height for the logging checkboxes.

[dcpomatic.git] / test / butler_test.cc

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 99bd95fce38307b499b91ca15612c554f224ad1a..f1ee446437bb51a1bc0b861558f077297094ff96 100644 (file)
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -32,6 +32,7 @@
 
 using std::make_shared;
 using std::shared_ptr;
+using boost::bind;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -59,15 +60,15 @@ BOOST_AUTO_TEST_CASE (butler_test1)
                map.set (i, i, 1);
        }
 
-       Butler butler (film, make_shared<Player>(film, false), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, false, false);
+       Butler butler (film, make_shared<Player>(film, Image::Alignment::COMPACT), map, 6, bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, false, false);
 
-       BOOST_CHECK (butler.get_video(true, 0).second == DCPTime());
-       BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(1, 24));
-       BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(2, 24));
+       BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime());
+       BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(1, 24));
+       BOOST_CHECK (butler.get_video(Butler::Behaviour::BLOCKING, 0).second == DCPTime::from_frames(2, 24));
        /* XXX: check the frame contents */
 
        float buffer[256 * 6];
-       BOOST_REQUIRE (butler.get_audio(buffer, 256) == DCPTime());
+       BOOST_REQUIRE (butler.get_audio(Butler::Behaviour::BLOCKING, buffer, 256) == DCPTime());
        for (int i = 0; i < 256; ++i) {
                BOOST_REQUIRE_EQUAL (buffer[i * 6 + 0], 0);
                BOOST_REQUIRE_EQUAL (buffer[i * 6 + 1], 0);