X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_reel_test.cc;h=da6ae8a30fb09a3ce6025d5b97e4715f339cb604;hb=5a9c7afb68167a11a61111b1e635b0c7d95cfa4f;hp=bb924cb9a74d5d8b70b9cdecf8ed0d2c5ae8634a;hpb=4443798ab850fa1054cfbb5a7b4db4eab2d6f7e3;p=dcpomatic.git

diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index bb924cb9a..da6ae8a30 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -34,11 +34,9 @@
 #include <boost/test/unit_test.hpp>
 
 
-using std::list;
 using std::string;
 using std::shared_ptr;
 using std::make_shared;
-using boost::optional;
 
 
 /* Check that timings are done correctly for multi-reel DCPs with PNG subs */
@@ -72,7 +70,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 	dcp::DCP dcp ("build/test/subtitle_reel_test/" + film->dcp_name());
 	dcp.read ();
 	BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
-	shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+	auto cpl = dcp.cpls().front();
 
 	auto reels = cpl->reels ();
 	BOOST_REQUIRE_EQUAL (reels.size(), 2U);
@@ -157,13 +155,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,