Mostly-merge master.

[dcpomatic.git] / test / play_test.cc

diff --git a/test/play_test.cc b/test/play_test.cc
index 690b042d8c32722f78e1c75e5c800e22cc685251..ed3e497ed6e3c4fc6248537ad1e98f7d22ce1241 100644 (file)
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -89,13 +89,13 @@ BOOST_AUTO_TEST_CASE (play_test)
        film->examine_and_add_content (A);
        wait_for_jobs ();
 
-       BOOST_CHECK_EQUAL (A->video_length().frames (24), 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().frames (30), 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);