Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x

[dcpomatic.git] / test / player_test.cc

diff --git a/test/player_test.cc b/test/player_test.cc
index 7b65783c6047dcfd646b1cae21e44bbc3550a531..a7e944cd4b0fbe57e62a414d7270d6eafc5c5068 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
        for (int i = 0; i < 10; ++i) {
                DCPTime t = DCPTime::from_frames (i, 24);
                butler->seek (t, true);
-               pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video();
+               pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(true, 0);
                BOOST_CHECK_EQUAL(video.second.get(), t.get());
                write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test_%1.png", i), "RGB");
                /* This 0.055 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
@@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
        for (int i = 0; i < 10; ++i) {
                DCPTime t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24);
                butler->seek (t, true);
-               pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video();
+               pair<shared_ptr<PlayerVideo>, DCPTime> video = butler->get_video(true, 0);
                BOOST_CHECK_EQUAL(video.second.get(), t.get());
                write_image(video.first->image(bind(PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true), String::compose("build/test/player_seek_test2_%1.png", i), "RGB");
                check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.055);
@@ -333,14 +333,14 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
        shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
 
        /* Wait for the butler to fill */
-       dcpomatic_sleep (5);
+       dcpomatic_sleep_seconds (5);
 
        boon->set_trim_start (ContentTime::from_seconds(5));
 
        butler->seek (DCPTime(), true);
 
        /* Wait for the butler to refill */
-       dcpomatic_sleep (5);
+       dcpomatic_sleep_seconds (5);
 
        butler->rethrow ();
 }