X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fbutler_test.cc;h=016767e1c321099bf729ea7ac33733567947b13c;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=213561341afb345bb8cc7d9442d399775004cc72;hpb=52525ae49dfc920b786e938bc8c559f9d4221dd5;p=dcpomatic.git

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 213561341..016767e1c 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -28,7 +28,11 @@
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (butler_test1)
 {
@@ -37,9 +41,9 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 	film->set_name ("butler_test1");
 	film->set_container (Ratio::from_id ("185"));
 
-	shared_ptr<Content> video = content_factory(film, "test/data/flat_red.png").front ();
+	shared_ptr<Content> video = content_factory("test/data/flat_red.png").front ();
 	film->examine_and_add_content (video);
-	shared_ptr<Content> audio = content_factory(film, "test/data/staircase.wav").front ();
+	shared_ptr<Content> audio = content_factory("test/data/staircase.wav").front ();
 	film->examine_and_add_content (audio);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -51,15 +55,15 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 		map.set (i, i, 1);
 	}
 
-	Butler butler (film, shared_ptr<Player>(new Player(film, film->playlist())), map, 6);
+	Butler butler (film, shared_ptr<Player>(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, false, false);
 
-	BOOST_CHECK (butler.get_video().second == DCPTime());
-	BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(1, 24));
-	BOOST_CHECK (butler.get_video().second == DCPTime::from_frames(2, 24));
+	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));
 	/* XXX: check the frame contents */
 
 	float buffer[256 * 6];
-	BOOST_REQUIRE (!butler.get_audio (buffer, 256));
+	BOOST_REQUIRE (butler.get_audio (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);