X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_playback_test.cc;h=120fecede9b17ab4dbfca8b3f43a7b63428f6c1a;hb=497803ab4424ce23affd231a01d625ddf3cf3aca;hp=e8d91648702907b7dec20e5c7c95d1c491e0d5f9;hpb=4219d4b76c5cd5690b1f4fa0c248d93ced26d05a;p=dcpomatic.git diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc index e8d916487..120fecede 100644 --- a/test/dcp_playback_test.cc +++ b/test/dcp_playback_test.cc @@ -28,19 +28,22 @@ using std::pair; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; /** Simulate the work that the player does, for profiling */ BOOST_AUTO_TEST_CASE (dcp_playback_test) { shared_ptr film = new_test_film ("dcp_playback_test"); - shared_ptr content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); + shared_ptr content (new DCPContent(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV")); film->examine_and_add_content (content); BOOST_REQUIRE (!wait_for_jobs()); shared_ptr butler ( new Butler( - shared_ptr(new Player(film, film->playlist(), film->length())), + shared_ptr(new Player(film)), AudioMapping(6, 6), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),