X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fbutler_test.cc;h=7575728fd3fce3bc6364df24145ff3013960cce2;hb=61dfa6671f042eda2267d7c179ad0468d9bdb5d0;hp=a453bd85858c32456d0f35cb5b47ec3be4c4f7e8;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/test/butler_test.cc b/test/butler_test.cc index a453bd858..7575728fd 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -29,6 +29,7 @@ #include using boost::shared_ptr; +using namespace dcpomatic; BOOST_AUTO_TEST_CASE (butler_test1) { @@ -51,11 +52,11 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (shared_ptr(new Player(film, film->playlist())), film->log(), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false); + Butler butler (shared_ptr(new Player(film)), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), 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];