Cleanup: use some stack allocation and shared_ptr.

[dcpomatic.git] / test / srt_subtitle_test.cc

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 63d508b7654ba4093c6492261dd1bada2b98ebae..0ee9cb197a3f3a38c24aa0ef89b702e79523331f 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -55,6 +55,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
        film->set_name ("frobozz");
        film->set_audio_channels (6);
        film->set_interop (false);
+       film->set_audio_channels(16);
        auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs());
@@ -101,8 +102,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
                });
 
-       /* Should be blank video with a subtitle MXF */
-       check_dcp ("test/data/srt_subtitle_test2", film->dir (film->dcp_name ()));
+       /* Should be blank video with a subtitle MXF; sound is irrelevant */
+       check_dcp("test/data/srt_subtitle_test2", film->dir(film->dcp_name()), true);
 }
 
 
@@ -158,8 +159,8 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
                        dcp::VerificationNote::Code::MISSING_CPL_METADATA
                });
 
-       /* Should be blank video with MXF subtitles */
-       check_dcp ("test/data/xml_subtitle_test", film->dir (film->dcp_name ()));
+       /* Should be blank video with MXF subtitles; sound is irrelevant */
+       check_dcp("test/data/xml_subtitle_test", film->dir(film->dcp_name()), true);
 }
 
 
@@ -172,6 +173,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
        film->set_name ("frobozz");
        film->set_interop (true);
        film->set_sequence (false);
+       film->set_audio_channels(6);
        for (auto i = 0; i < 2; ++i) {
                auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
                content->only_text()->set_use (true);
@@ -203,7 +205,11 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
                });
 
-       check_dcp ("test/data/srt_subtitle_test6", film->dir(film->dcp_name()));
+       /* This test is concerned with the subtitles, so we'll ignore any
+        * differences in sound between the DCP and the reference to avoid test
+        * failures for unrelated reasons.
+        */
+       check_dcp("test/data/srt_subtitle_test6", film->dir(film->dcp_name()), true);
 }