Bump libdcp for asdcplib version fix.

[dcpomatic.git] / test / reel_writer_test.cc

diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc
index 5177a5c2f6eacb174706911ce256122af988c54c..1223a217aec9fcbaa67bd00a6a7c2209704b7da4 100644 (file)
--- a/test/reel_writer_test.cc
+++ b/test/reel_writer_test.cc
@@ -39,7 +39,7 @@
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 static bool equal (dcp::FrameInfo a, ReelWriter const & writer, shared_ptr<InfoFileHandle> file, Frame frame, Eyes eyes)
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (write_frame_info_test)
 {
        shared_ptr<Film> film = new_test_film2 ("write_frame_info_test");
        dcpomatic::DCPTimePeriod const period (dcpomatic::DCPTime(0), dcpomatic::DCPTime(96000));
-       ReelWriter writer (film, period, shared_ptr<Job>(), 0, 1, optional<string>());
+       ReelWriter writer (film, period, shared_ptr<Job>(), 0, 1, false);
 
        /* Write the first one */
 
@@ -116,8 +116,8 @@ BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
        /* Find main picture and sound asset IDs */
        dcp::DCP dcp1 (film->dir(film->dcp_name()));
        dcp1.read ();
-       BOOST_REQUIRE_EQUAL (dcp1.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (dcp1.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp1.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (dcp1.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_picture());
        BOOST_REQUIRE (dcp1.cpls().front()->reels().front()->main_sound());
        string const picture_id = dcp1.cpls().front()->reels().front()->main_picture()->asset()->id();
@@ -131,8 +131,8 @@ BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
        /* Video ID should be the same, sound different */
        dcp::DCP dcp2 (film->dir(film->dcp_name()));
        dcp2.read ();
-       BOOST_REQUIRE_EQUAL (dcp2.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (dcp2.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp2.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (dcp2.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_picture());
        BOOST_REQUIRE (dcp2.cpls().front()->reels().front()->main_sound());
        BOOST_CHECK_EQUAL (picture_id, dcp2.cpls().front()->reels().front()->main_picture()->asset()->id());
@@ -146,8 +146,8 @@ BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
        /* Video and sound IDs should be different */
        dcp::DCP dcp3 (film->dir(film->dcp_name()));
        dcp3.read ();
-       BOOST_REQUIRE_EQUAL (dcp3.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (dcp3.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp3.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (dcp3.cpls().front()->reels().size(), 1U);
        BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_picture());
        BOOST_REQUIRE (dcp3.cpls().front()->reels().front()->main_sound());
        BOOST_CHECK (picture_id != dcp3.cpls().front()->reels().front()->main_picture()->asset()->id());