Some macOS test build fixes.

[dcpomatic.git] / test / empty_test.cc

diff --git a/test/empty_test.cc b/test/empty_test.cc
index 1a4d03300bf5a81740f7d1f987bb917a053c40d8..7b374ba49e9b8dd0d5938a119dc443c0fa4decf3 100644 (file)
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/empty_test.cc
+ *  @brief Test the creation of Empty objects.
+ *  @ingroup specific
+ */
+
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
@@ -31,6 +36,9 @@
 
 using std::list;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 bool
@@ -55,15 +63,13 @@ 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));
-       BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
+       Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
+       BOOST_REQUIRE_EQUAL (black._periods.size(), 2U);
        list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
        BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr));
        BOOST_CHECK (i->to ==   DCPTime::from_frames(2, vfr));
@@ -89,15 +95,13 @@ 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));
-       BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
+       Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
+       BOOST_REQUIRE_EQUAL (black._periods.size(), 1U);
        BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
        BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
 
@@ -129,17 +133,15 @@ 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));
-       BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
+       Empty black (film, playlist, bind(&has_video, _1), playlist->length(film));
+       BOOST_REQUIRE_EQUAL (black._periods.size(), 1U);
        BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr));
        BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));