X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsrt_subtitle_test.cc;h=bac0bedeccb7b31cd72054c21508f9d703458e30;hb=591c89275bfa26c3b2e1b0f1926909fc4bf5b219;hp=3863ebf9f26a8aad1250f3f5d482f921dd7aeeb3;hpb=430825272e1a6cf266a184afe5acc0fa9811fff8;p=dcpomatic.git

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 3863ebf9f..bac0bedec 100644
--- 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());
@@ -99,7 +100,11 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 			dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
 			dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
 			dcp::VerificationNote::Code::MISSING_CPL_METADATA
-		});
+		},
+		true,
+		/* ClairMeta tries to inspect the font file and fails because it isn't one */
+		false
+		);
 
 	/* Should be blank video with a subtitle MXF; sound is irrelevant */
 	check_dcp("test/data/srt_subtitle_test2", film->dir(film->dcp_name()), true);
@@ -128,6 +133,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
+	content->only_text()->set_language(dcp::LanguageTag("de"));
 
 	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
@@ -172,10 +178,12 @@ 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);
 		content->only_text()->set_burn (false);
+		content->only_text()->set_language(dcp::LanguageTag("de"));
 		film->examine_and_add_content (content);
 		BOOST_REQUIRE (!wait_for_jobs());
 		content->set_position (film, DCPTime());