Mostly-merge master.

[dcpomatic.git] / test / play_test.cc

diff --git a/test/play_test.cc b/test/play_test.cc
index 54fe2699f7fd47b19ad9ac666a70857e309d4567..ed3e497ed6e3c4fc6248537ad1e98f7d22ce1241 100644 (file)
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -89,20 +89,20 @@ BOOST_AUTO_TEST_CASE (play_test)
        film->examine_and_add_content (A);
        wait_for_jobs ();
 
-       BOOST_CHECK_EQUAL (A->video_length(), 16);
+       BOOST_CHECK_EQUAL (A->video_length_after_3d_combine().frames (24), 16);
 
        shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4"));
        film->examine_and_add_content (B);
        wait_for_jobs ();
 
-       BOOST_CHECK_EQUAL (B->video_length(), 16);
+       BOOST_CHECK_EQUAL (B->video_length_after_3d_combine().frames (30), 16);
        
        /* Film should have been set to 25fps */
        BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
-       BOOST_CHECK_EQUAL (A->position(), 0);
+       BOOST_CHECK_EQUAL (A->position(), DCPTime ());
        /* A is 16 frames long at 25 fps */
-       BOOST_CHECK_EQUAL (B->position(), 16 * TIME_HZ / 25);
+       BOOST_CHECK_EQUAL (B->position(), DCPTime::from_frames (16, 25));
 
        shared_ptr<Player> player = film->make_player ();
        PlayerWrapper wrap (player);
@@ -117,10 +117,10 @@ BOOST_AUTO_TEST_CASE (play_test)
                }
        }
 
-       player->seek (6 * TIME_HZ / 25, true);
+       player->seek (DCPTime::from_frames (6, 25), true);
        optional<Video> v = wrap.get_video ();
        BOOST_CHECK (v);
-       BOOST_CHECK_EQUAL (v.get().time, 6 * TIME_HZ / 25);
+       BOOST_CHECK_EQUAL (v.get().time, DCPTime::from_frames (6, 25));
 }
 
 #endif