Change video content scaling so that it either:

[dcpomatic.git] / test / empty_test.cc

diff --git a/test/empty_test.cc b/test/empty_test.cc
index 1a4d03300bf5a81740f7d1f987bb917a053c40d8..a2557d4d846dbc7fbbe88b950b6d7388f9938c5c 100644 (file)
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -55,14 +55,12 @@ BOOST_AUTO_TEST_CASE (empty_test1)
        /* 0 1 2 3 4 5 6 7
         *     A A A     B
         */
-       contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentA->video->set_length (3);
        contentA->set_position (film, DCPTime::from_frames (2, vfr));
-       contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentB->video->set_length (1);
        contentB->set_position (film, DCPTime::from_frames (7, vfr));
 
-       Empty black (film, film->playlist(), bind(&has_video, _1));
+       Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
        BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
        list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
        BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr));
@@ -89,14 +87,12 @@ BOOST_AUTO_TEST_CASE (empty_test2)
        /* 0 1 2 3 4 5 6 7
         * A A A         B
         */
-       contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentA->video->set_length (3);
        contentA->set_position (film, DCPTime(0));
-       contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentB->video->set_length (1);
        contentB->set_position (film, DCPTime::from_frames(7, vfr));
 
-       Empty black (film, film->playlist(), bind(&has_video, _1));
+       Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
        BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
        BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
        BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
@@ -129,16 +125,14 @@ BOOST_AUTO_TEST_CASE (empty_test3)
        /* 0 1 2 3 4 5 6 7
         * A A A         B
         */
-       contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentA->video->set_length (3);
        contentA->set_position (film, DCPTime(0));
-       contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentB->video->set_length (1);
        contentB->set_position (film, DCPTime::from_frames(7, vfr));
 
        shared_ptr<Playlist> playlist (new Playlist);
        playlist->add (film, contentB);
-       Empty black (film, playlist, bind(&has_video, _1));
+       Empty black (film, playlist, bind(&has_video, _1), playlist->length(film));
        BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
        BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr));
        BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));