X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fbutler_test.cc;h=7fd5ea57113bdb43135b281000a86204b3140284;hb=280454a14ebf4dceeac3077e41fceec36d9ec3e3;hp=bee66217f31c432de7a6fb419cfa587db1dbeab5;hpb=0c846af54055b9915c6c68617cd28176d5f84351;p=dcpomatic.git diff --git a/test/butler_test.cc b/test/butler_test.cc index bee66217f..7fd5ea571 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -60,7 +60,18 @@ BOOST_AUTO_TEST_CASE (butler_test1) map.set (i, i, 1); } - Butler butler (film, make_shared(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(film, Image::Alignment::COMPACT), + map, + 6, + boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), + VideoRange::FULL, + Image::Alignment::COMPACT, + false, + false, + Butler::Audio::ENABLED + ); 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)); @@ -94,7 +105,18 @@ BOOST_AUTO_TEST_CASE (butler_test2) map.set (i, i, 1); } - Butler butler (film, make_shared(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(film, Image::Alignment::COMPACT), + map, + 6, + boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), + VideoRange::FULL, + Image::Alignment::COMPACT, + false, + false, + Butler::Audio::ENABLED + ); int const audio_frames_per_video_frame = 48000 / 25; float audio_buffer[audio_frames_per_video_frame * 6];