diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-09 21:20:10 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-09 21:20:10 +0200 |
| commit | c27d14badb229c24533db65dbaee1939dce89455 (patch) | |
| tree | 250f422babe86b56bac69fe45142fd1fd4d0ec11 /test | |
| parent | f10849bd52470a93f54bb90686aa9a3b1e72e796 (diff) | |
Make DCP text track language properly optional and ignore bad values on imported DCPs (#1950).
Diffstat (limited to 'test')
| -rw-r--r-- | test/closed_caption_test.cc | 6 | ||||
| -rw-r--r-- | test/subtitle_reel_test.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc index 2b80c812e..bcb6f84a7 100644 --- a/test/closed_caption_test.cc +++ b/test/closed_caption_test.cc @@ -75,11 +75,11 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2) auto film = new_test_film2 ("closed_caption_test2", { content1, content2, content3 }, &cl); content1->only_text()->set_type (TextType::CLOSED_CAPTION); - content1->only_text()->set_dcp_track (DCPTextTrack("First track", "fr-FR")); + content1->only_text()->set_dcp_track (DCPTextTrack("First track", dcp::LanguageTag("fr-FR"))); content2->only_text()->set_type (TextType::CLOSED_CAPTION); - content2->only_text()->set_dcp_track (DCPTextTrack("Second track", "de-DE")); + content2->only_text()->set_dcp_track (DCPTextTrack("Second track", dcp::LanguageTag("de-DE"))); content3->only_text()->set_type (TextType::CLOSED_CAPTION); - content3->only_text()->set_dcp_track (DCPTextTrack("Third track", "it-IT")); + content3->only_text()->set_dcp_track (DCPTextTrack("Third track", dcp::LanguageTag("it-IT"))); make_and_verify_dcp ( film, diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc index bb924cb9a..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, |