X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=74d5edd3f4753866218acdeb52ed06435915c620;hb=9dbf21fd28991898e61020de0809497999282562;hp=2ab7eaec37deb90d6b0ad1ea3ca6f649ad5ae251;hpb=952084c4221c5708e02c783284cf0f7239c6b4c4;p=dcpomatic.git diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 2ab7eaec3..74d5edd3f 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) make_shared(film, Image::Alignment::PADDED), AudioMapping(6, 6), 6, - bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), + boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, @@ -57,13 +57,13 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) auto audio_buffer = new float[2000 * 6]; while (true) { - auto p = butler->get_video (true, 0); + auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0); if (!p.first) { break; } /* assuming DCP is 24fps/48kHz */ - butler->get_audio (audio_buffer, 2000); - p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); + butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer, 2000); + p.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } delete[] audio_buffer; }