X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fbutler_test.cc;h=0422b89ad45af1a834704332497292a23ea1e620;hp=bee66217f31c432de7a6fb419cfa587db1dbeab5;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=0c846af54055b9915c6c68617cd28176d5f84351 diff --git a/test/butler_test.cc b/test/butler_test.cc index bee66217f..0422b89ad 100644 --- a/test/butler_test.cc +++ b/test/butler_test.cc @@ -60,7 +60,7 @@ 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); 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 +94,9 @@ 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 + ); int const audio_frames_per_video_frame = 48000 / 25; float audio_buffer[audio_frames_per_video_frame * 6];