X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fvf_test.cc;h=aff9bdae91072aafb7b0b4ff78feb721b603ff7c;hb=290d6d7a61aadda3f6d317465507caa7ffac1ba2;hp=8cbf7a3457da5cb74e57a1b82cab60e19d70ef70;hpb=ad45191cc3cb78900d0a434c9a838c2e171cc706;p=dcpomatic.git

diff --git a/test/vf_test.cc b/test/vf_test.cc
index 8cbf7a345..aff9bdae9 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/vf_Test.cc
  *  @brief Various VF-related tests.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "lib/film.h"
@@ -37,14 +37,13 @@
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::list;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 /** Test the logic which decides whether a DCP can be referenced or not */
@@ -127,8 +126,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
 	dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
 	ov_c.read ();
-	BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+	BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
 	BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
 	string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
 	BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@ -137,8 +136,8 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 
 	dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
 	vf_c.read ();
-	BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+	BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
 	BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
 	BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->id(), pic_id);
 	BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_sound());
@@ -184,8 +183,8 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 
 	dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
 	vf_c.read ();
-	BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1);
+	BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 1U);
 	BOOST_REQUIRE (vf_c.cpls().front()->reels().front()->main_picture());
 	BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->entry_point().get_value_or(0), 24);
 	BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().front()->main_picture()->actual_duration(), 72);
@@ -234,8 +233,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
 	dcp::DCP ov_c (ov->dir (ov->dcp_name ()));
 	ov_c.read ();
-	BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1);
+	BOOST_REQUIRE_EQUAL (ov_c.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (ov_c.cpls().front()->reels().size(), 1U);
 	BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_picture());
 	string const pic_id = ov_c.cpls().front()->reels().front()->main_picture()->id();
 	BOOST_REQUIRE (ov_c.cpls().front()->reels().front()->main_sound());
@@ -244,8 +243,8 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 
 	dcp::DCP vf_c (vf->dir (vf->dcp_name ()));
 	vf_c.read ();
-	BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1);
-	BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2);
+	BOOST_REQUIRE_EQUAL (vf_c.cpls().size(), 1U);
+	BOOST_REQUIRE_EQUAL (vf_c.cpls().front()->reels().size(), 2U);
 	BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_picture());
 	BOOST_CHECK_EQUAL (vf_c.cpls().front()->reels().back()->main_picture()->id(), pic_id);
 	BOOST_REQUIRE (vf_c.cpls().front()->reels().back()->main_sound());
@@ -287,9 +286,9 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Check that the selected reel assets are right */
-	shared_ptr<Player> player (new Player(vf, vf->playlist()));
+	shared_ptr<Player> player (new Player(vf));
 	list<ReferencedReelAsset> a = player->get_reel_assets();
-	BOOST_REQUIRE_EQUAL (a.size(), 4);
+	BOOST_REQUIRE_EQUAL (a.size(), 4U);
 	list<ReferencedReelAsset>::const_iterator i = a.begin();
 	BOOST_CHECK (i->period == DCPTimePeriod(DCPTime(0), DCPTime(960000)));
 	++i;