#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 */
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);
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,
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);
}
}