X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=62c72cc84e85fd25e86ee605643e27fe4811a78c;hb=fcba100f0dfd1d4214291abb76f22ebd696c24d4;hp=66a73579820f9cb6a872d8e2061b2e7948c7a125;hpb=c8fa584045ad65283a85015f18ee8789ddf881d1;p=dcpomatic.git diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 66a735798..62c72cc84 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -48,22 +48,22 @@ 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, - false + false, + Butler::Audio::ENABLED ); - auto audio_buffer = new float[2000 * 6]; + std::vector audio_buffer(2000 * 6); while (true) { auto p = butler->get_video (Butler::Behaviour::BLOCKING, 0); if (!p.first) { break; } /* assuming DCP is 24fps/48kHz */ - butler->get_audio (Butler::Behaviour::BLOCKING, 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.data(), 2000); + p.first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } - delete[] audio_buffer; }