X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_reel_test.cc;h=4a2021ba96ed136ba45533b733507b6df62d8857;hb=cd6c6a693f19fcaa6c75ed60f48a54a8cae51352;hp=d75c8af1a155dfd6b8151fb9fcd8aa3cb23b0e84;hpb=a8f48589d3eaec9de5bfd34f45410f88ab836363;p=dcpomatic.git

diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index d75c8af1a..4a2021ba9 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -157,13 +157,13 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 	film->examine_and_add_content (ccap1);
 	BOOST_REQUIRE (!wait_for_jobs());
 	ccap1->text.front()->set_type (TextType::CLOSED_CAPTION);
-	ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", "de-DE"));
+	ccap1->text.front()->set_dcp_track (DCPTextTrack("Test", dcp::LanguageTag("de-DE")));
 
 	auto ccap2 = content_factory("test/data/15s.srt").front();
 	film->examine_and_add_content (ccap2);
 	BOOST_REQUIRE (!wait_for_jobs());
 	ccap2->text.front()->set_type (TextType::CLOSED_CAPTION);
-	ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", "en-GB"));
+	ccap2->text.front()->set_dcp_track (DCPTextTrack("Other", dcp::LanguageTag("en-GB")));
 
 	make_and_verify_dcp (
 		film,
@@ -212,20 +212,20 @@ BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries)
 	film->examine_and_add_content (subtitle);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	make_and_verify_dcp (film, {{ dcp::VerificationNote::Code::INVALID_STANDARD }});
+	make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD });
 
 	dcp::DCP dcp (film->dir(film->dcp_name()));
 	dcp.read();
-	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
 	auto cpl = dcp.cpls()[0];
-	BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3);
+	BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U);
 
 	for (auto i: cpl->reels()) {
 		auto reel_sub = i->main_subtitle();
 		BOOST_REQUIRE (reel_sub);
 		auto sub = reel_sub->asset();
 		BOOST_REQUIRE (sub);
-		BOOST_CHECK_EQUAL (sub->subtitles().size(), 1);
+		BOOST_CHECK_EQUAL (sub->subtitles().size(), 1U);
 	}
 }