Adapt reels_test for 4a8151a.

[dcpomatic.git] / test / reels_test.cc

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 0942c4c2695592ef3380023486ee3bd481d0bbba..b8a0b0a60851ecff8686786e8a1dead183037d69 100644 (file)
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -91,6 +91,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        shared_ptr<Film> film = new_test_film ("reels_test2");
        film->set_name ("reels_test2");
        film->set_container (Ratio::from_id ("185"));
+       film->set_interop (false);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
        {
@@ -194,6 +195,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_interop (false);
 
        /* 4 piece of 1s-long content */
        shared_ptr<ImageContent> content[4];
@@ -236,8 +238,8 @@ BOOST_AUTO_TEST_CASE (reels_test5)
        film->examine_and_add_content (dcp);
        wait_for_jobs ();
 
-       /* Set to 123 but it will be rounded up to the next frame (4000) */
-       dcp->set_position(DCPTime(123));
+       /* Set to 2123 but it will be rounded up to the next frame (4000) */
+       dcp->set_position(DCPTime(2123));
 
        {
                list<DCPTimePeriod> p = dcp->reels ();
@@ -340,12 +342,11 @@ BOOST_AUTO_TEST_CASE (reels_test8)
        BOOST_REQUIRE (!wait_for_jobs ());
 
        A->set_trim_end (ContentTime::from_seconds (1));
-       cout << to_string(A->length_after_trim()) << "\n";
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs ());
 }
 
-/** Check another reels-wrleated error; make_dcp() would raise a ProgrammingError */
+/** Check another reels-related error; make_dcp() would raise a ProgrammingError */
 BOOST_AUTO_TEST_CASE (reels_test9)
 {
        shared_ptr<Film> film = new_test_film2("reels_test9a");