Move private_data into TestPaths

[dcpomatic.git] / test / dcp_playback_test.cc

diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 04a0eabe3f5474fdbd84e04c6148ee4f65fffb88..78785737548db4536da3e5ae5a2c1012de36bd39 100644 (file)
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -28,12 +28,13 @@
 using std::pair;
 using boost::shared_ptr;
 using boost::optional;
+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());
 
@@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
                );
        float* audio_buffer = new float[2000*6];
        while (true) {
-               pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video ();
+               pair<shared_ptr<PlayerVideo>, DCPTime> p = butler->get_video (true, 0);
                if (!p.first) {
                        break;
                }