Verify a whole bunch of DCPs made by unit tests.

[dcpomatic.git] / test / silence_padding_test.cc

diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 9c432d3e2c738147b03e67ca1639af11b526e815..328f9bef74bc4bdce99d40428abb1ae25b1909af 100644 (file)
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -37,26 +37,24 @@
 #include <dcp/sound_asset_reader.h>
 #include <boost/test/unit_test.hpp>
 
+using std::make_shared;
 using std::string;
+using std::shared_ptr;
 using boost::lexical_cast;
-using boost::shared_ptr;
 
 static void
 test_silence_padding (int channels)
 {
        string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
-       shared_ptr<Film> film = new_test_film (film_name);
-       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-       film->set_container (Ratio::from_id ("185"));
-       film->set_name (film_name);
-
-       shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
+       auto film = new_test_film2 (
+               film_name,
+               {
+                       make_shared<FFmpegContent>("test/data/flat_red.png"),
+                       make_shared<FFmpegContent>("test/data/staircase.wav")
+               });
 
        film->set_audio_channels (channels);
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (film);
 
        boost::filesystem::path path = "build/test";
        path /= film_name;
@@ -64,7 +62,7 @@ test_silence_padding (int channels)
        dcp::DCP check (path.string ());
        check.read ();
 
-       shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
+       auto sound_asset = check.cpls()[0]->reels()[0]->main_sound();
        BOOST_CHECK (sound_asset);
        BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), channels);
 
@@ -74,7 +72,7 @@ test_silence_padding (int channels)
        int frame = 0;
 
        while (n < sound_asset->asset()->intrinsic_duration()) {
-               shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
+               auto sound_frame = sound_asset->asset()->start_read()->get_frame(frame++);
                uint8_t const * d = sound_frame->data ();
 
                for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
@@ -135,14 +133,15 @@ BOOST_AUTO_TEST_CASE (silence_padding_test)
 
 BOOST_AUTO_TEST_CASE (silence_padding_test2)
 {
-       shared_ptr<Film> film = new_test_film2 ("silence_padding_test2");
-       shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data() / "cars.mov"));
-       film->examine_and_add_content (content);
-       BOOST_REQUIRE (!wait_for_jobs());
+       Cleanup cl;
+
+       auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "cars.mov");
+       auto film = new_test_film2 ("silence_padding_test2", { content }, &cl);
 
        film->set_video_frame_rate (24);
        content->set_trim_start (dcpomatic::ContentTime(4003));
 
-       film->make_dcp ();
-       BOOST_REQUIRE (!wait_for_jobs());
+       make_and_verify_dcp (film);
+
+       cl.run ();
 }