X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=66a73579820f9cb6a872d8e2061b2e7948c7a125;hb=5f206d32ff60148ab72b35d5823f56bdbb7f50bf;hp=2ea638d74c3b82c2ba27b80a0de11ed66fe431af;hpb=9bfa07293928c371d59db2091ba2b7e715ce5994;p=dcpomatic.git diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index 2ea638d74..66a735798 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -45,25 +45,25 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test) auto butler = std::make_shared( film, - make_shared(film, false), + make_shared(film, Image::Alignment::PADDED), AudioMapping(6, 6), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, - false, + Image::Alignment::PADDED, true, false ); 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, false, true); + butler->get_audio (Butler::Behaviour::BLOCKING, audio_buffer, 2000); + p.first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VideoRange::FULL, true); } delete[] audio_buffer; }