Adapt for libdcp use of enum class.

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index cb485e68a872a2845b8c821d0ae1071ccf0b66e3..7729cfe5b4d2c21c635d1a455f8f6dd992552144 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -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());
@@ -131,12 +131,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
        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")));
@@ -148,12 +148,12 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
        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));
 }