X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimport_dcp_test.cc;h=7729cfe5b4d2c21c635d1a455f8f6dd992552144;hb=28111007e2e6fd62f5810be780706ae1618bd33f;hp=2f33f93f55c3f66c3dada323cdcbe9823a6397ee;hpb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;p=dcpomatic.git

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 2f33f93f5..7729cfe5b 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/import_dcp_test.cc
  *  @brief Test import of encrypted DCPs.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "test.h"
@@ -43,8 +43,8 @@
 using std::vector;
 using std::string;
 using std::map;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 /** Make an encrypted DCP, import it and make a new unencrypted DCP */
 BOOST_AUTO_TEST_CASE (import_dcp_test)
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 		A_dcp.cpls().front()->file().get(),
 		dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
 		dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
-		dcp::MODIFIED_TRANSITIONAL_1,
+		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 		true, 0
 		);
 
@@ -111,9 +111,9 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 
 	content->video->set_length (24 * 60 * 10);
 
-	film->set_marker(dcp::FFOC, dcpomatic::DCPTime::from_seconds(1.91));
-	film->set_marker(dcp::FFMC, dcpomatic::DCPTime::from_seconds(9.4));
-	film->set_marker(dcp::LFMC, dcpomatic::DCPTime::from_seconds(9.99));
+	film->set_marker(dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1.91));
+	film->set_marker(dcp::Marker::FFMC, dcpomatic::DCPTime::from_seconds(9.4));
+	film->set_marker(dcp::Marker::LFMC, dcpomatic::DCPTime::from_seconds(9.99));
 
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -125,15 +125,18 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 	BOOST_REQUIRE (!wait_for_jobs());
 	film2->write_metadata ();
 
-	BOOST_CHECK_EQUAL (imported->markers().size(), 3U);
+	/* When import_dcp_markers_test was made a LFOC marker will automatically
+	 * have been added.
+	 */
+	BOOST_CHECK_EQUAL (imported->markers().size(), 4U);
 
 	map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
-	BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
-	BOOST_CHECK(markers[dcp::FFOC] == dcpomatic::ContentTime(184000));
-	BOOST_REQUIRE(markers.find(dcp::FFMC) != markers.end());
-	BOOST_CHECK(markers[dcp::FFMC] == dcpomatic::ContentTime(904000));
-	BOOST_REQUIRE(markers.find(dcp::LFMC) != markers.end());
-	BOOST_CHECK(markers[dcp::LFMC] == dcpomatic::ContentTime(960000));
+	BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end());
+	BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000));
+	BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
+	BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
+	BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
+	BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000));
 
 	/* Load that film and check that the markers have been loaded */
 	shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_markers_test2")));
@@ -142,15 +145,15 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 	shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
 	BOOST_REQUIRE (reloaded);
 
-	BOOST_CHECK_EQUAL (reloaded->markers().size(), 3U);
+	BOOST_CHECK_EQUAL (reloaded->markers().size(), 4U);
 
 	markers = reloaded->markers();
-	BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
-	BOOST_CHECK(markers[dcp::FFOC] == dcpomatic::ContentTime(184000));
-	BOOST_REQUIRE(markers.find(dcp::FFMC) != markers.end());
-	BOOST_CHECK(markers[dcp::FFMC] == dcpomatic::ContentTime(904000));
-	BOOST_REQUIRE(markers.find(dcp::LFMC) != markers.end());
-	BOOST_CHECK(markers[dcp::LFMC] == dcpomatic::ContentTime(960000));
+	BOOST_REQUIRE(markers.find(dcp::Marker::FFOC) != markers.end());
+	BOOST_CHECK(markers[dcp::Marker::FFOC] == dcpomatic::ContentTime(184000));
+	BOOST_REQUIRE(markers.find(dcp::Marker::FFMC) != markers.end());
+	BOOST_CHECK(markers[dcp::Marker::FFMC] == dcpomatic::ContentTime(904000));
+	BOOST_REQUIRE(markers.find(dcp::Marker::LFMC) != markers.end());
+	BOOST_CHECK(markers[dcp::Marker::LFMC] == dcpomatic::ContentTime(960000));
 }