Some macOS test build fixes.

[dcpomatic.git] / test / dcp_playback_test.cc

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 1dda667a08ab825bac698cb9e2fe6ca83a7bbf53..120fecede9b17ab4dbfca8b3f43a7b63428f6c1a 100644 (file)
--- 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> film = new_test_film ("dcp_playback_test");
-       shared_ptr<DCPContent> content (new DCPContent(private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+       shared_ptr<DCPContent> 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> butler (
                new Butler(
-                       shared_ptr<Player>(new Player(film, film->playlist())),
+                       shared_ptr<Player>(new Player(film)),
                        AudioMapping(6, 6),
                        6,
                        bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),