X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fbutler_test.cc;h=f1ee446437bb51a1bc0b861558f077297094ff96;hb=f73d5b46100d30cd8abc8beaaf5195bd633d9f4d;hp=787d1c3248a695e9f8ad114124280b72cd7aaa0f;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 787d1c324..f1ee44643 100644
--- 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, Image::Alignment::COMPACT), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, 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);