Adapt for libdcp use of enum class.

[dcpomatic.git] / test / atmos_test.cc

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index e5846f20e5f3927dd723914c01f710ea0de1d124..6689ee8d72e22d2c4cf39297e2bbb01755b54323 100644 (file)
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -32,14 +32,14 @@
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 {
        shared_ptr<Film> film = new_test_film2 ("atmos_passthrough_test");
-       boost::filesystem::path ref = TestPaths::private_data / "atmos_asset.mxf";
-       shared_ptr<Content> content = content_factory (TestPaths::private_data / "atmos_asset.mxf").front();
+       boost::filesystem::path ref = TestPaths::private_data() / "atmos_asset.mxf";
+       shared_ptr<Content> content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 {
        shared_ptr<Film> film = new_test_film2 ("atmos_encrypted_passthrough_test");
-       boost::filesystem::path ref = TestPaths::private_data / "atmos_asset.mxf";
-       shared_ptr<Content> content = content_factory (TestPaths::private_data / "atmos_asset.mxf").front();
+       boost::filesystem::path ref = TestPaths::private_data() / "atmos_asset.mxf";
+       shared_ptr<Content> content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
                dcp_file(film, "cpl"),
                dcp::LocalTime(),
                dcp::LocalTime(),
-               dcp::MODIFIED_TRANSITIONAL_1,
+               dcp::Formulation::MODIFIED_TRANSITIONAL_1,
                false,
                optional<int>()
                );