X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=5117be9edd7566ecaa0a94aa7e959bcee235e7d6;hb=HEAD;hp=74d5edd3f4753866218acdeb52ed06435915c620;hpb=4f9314a311de379b105741273a15821da62a75cc;p=dcpomatic.git diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 74d5edd3f..a5b69e181 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -43,27 +43,29 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); + Player player(film, Image::Alignment::PADDED); + auto butler = std::make_shared( film, - make_shared(film, Image::Alignment::PADDED), + player, AudioMapping(6, 6), 6, 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); + 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; }