Cleanup: whitespace fix.

[dcpomatic.git] / test / content_test.cc

diff --git a/test/content_test.cc b/test/content_test.cc
index a22be29aac16130183dec3024ade5c117d028637..85862af82e32e0f44328d8a556d0d49d2d1d4c23 100644 (file)
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -35,7 +35,6 @@
 #include <boost/test/unit_test.hpp>
 
 
-using std::shared_ptr;
 using namespace dcpomatic;
 
 
@@ -55,15 +54,7 @@ BOOST_AUTO_TEST_CASE (content_test1)
                { dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE }
                );
 
-       boost::filesystem::path check;
-
-       for (auto i: boost::filesystem::directory_iterator("build/test/content_test1/" + film->dcp_name())) {
-               if (i.path().leaf().string().substr(0, 4) == "pcm_") {
-                       check = i;
-               }
-       }
-
-       check_mxf_audio_file (TestPaths::private_data() / "content_test1.mxf", check);
+       check_mxf_audio_file(TestPaths::private_data() / "content_test1.mxf", dcp_file(film, "pcm_"));
 }
 
 
@@ -74,7 +65,7 @@ BOOST_AUTO_TEST_CASE (content_test2)
 {
        auto content = content_factory("test/data/red_23976.mp4")[0];
        auto film = new_test_film2 ("content_test2", {content});
-       content->set_trim_start(ContentTime::from_seconds(0.5));
+       content->set_trim_start(film, ContentTime::from_seconds(0.5));
        make_and_verify_dcp (film);
 }
 
@@ -89,15 +80,15 @@ BOOST_AUTO_TEST_CASE (content_test3)
        /* Trim */
 
        /* 12 frames */
-       content->set_trim_start (ContentTime::from_seconds (12.0 / 24.0));
+       content->set_trim_start(film, ContentTime::from_seconds (12.0 / 24.0));
        BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (12.0 / 24.0));
 
        /* 11.2 frames */
-       content->set_trim_start (ContentTime::from_seconds (11.2 / 24.0));
+       content->set_trim_start(film, ContentTime::from_seconds (11.2 / 24.0));
        BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (11.0 / 24.0));
 
        /* 13.9 frames */
-       content->set_trim_start (ContentTime::from_seconds (13.9 / 24.0));
+       content->set_trim_start(film, ContentTime::from_seconds (13.9 / 24.0));
        BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (14.0 / 24.0));
 
        /* Position */
@@ -114,7 +105,7 @@ BOOST_AUTO_TEST_CASE (content_test3)
        content->set_position (film, DCPTime::from_seconds(13.9 / 24.0));
        BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
 
-       content->set_video_frame_rate (25);
+       content->set_video_frame_rate(film, 25);
 
        /* Check that trim is fixed when the content's video frame rate is `forced' */