diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-02 22:38:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-04 20:48:34 +0200 |
| commit | f188fc8d92eaba89aaa63cfd7f5a2fc9836e94b6 (patch) | |
| tree | 576f98fd4295ae0e9dae6e0ae92f019876f02ff3 /test/isdcf_name_test.cc | |
| parent | 60520afb4a6bb364c981c2b6976805d4128ac81f (diff) | |
Use release territory from Interop/SMPTE metadata instead of ISDCF metadata dialogue.
Diffstat (limited to 'test/isdcf_name_test.cc')
| -rw-r--r-- | test/isdcf_name_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 3d7b69665..51a8c5009 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -61,19 +61,19 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) BOOST_REQUIRE (audio->audio); audio->audio->set_language(dcp::LanguageTag("en-US")); film->set_content_versions({"1"}); + film->set_release_territory(dcp::LanguageTag::RegionSubtag("GB")); ISDCFMetadata m; - m.territory = "UK"; m.rating = "PG"; m.studio = "ST"; m.facility = "FA"; film->set_isdcf_metadata (m); film->set_interop (true); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_UK-PG_10_2K_ST_20140704_FA_IOP_OV"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_EN-XX_GB-PG_10_2K_ST_20140704_FA_IOP_OV"); /* Check that specifying no audio language writes XX */ audio->audio->set_language (boost::none); film->set_isdcf_metadata (m); - BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_XX-XX_UK-PG_10_2K_ST_20140704_FA_IOP_OV"); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilm_FTR-1_F_XX-XX_GB-PG_10_2K_ST_20140704_FA_IOP_OV"); /* Test a long name and some different data */ @@ -89,13 +89,13 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) text->text.front()->set_language (dcp::LanguageTag("fr-FR")); film->examine_and_add_content (text); film->set_version_number(2); + film->set_release_territory(dcp::LanguageTag::RegionSubtag("US")); BOOST_REQUIRE (!wait_for_jobs()); audio = content_factory("test/data/sine_440.wav").front(); film->examine_and_add_content (audio); BOOST_REQUIRE (!wait_for_jobs()); BOOST_REQUIRE (audio->audio); audio->audio->set_language (dcp::LanguageTag("de-DE")); - m.territory = "US"; m.rating = "R"; m.studio = "DI"; m.facility = "PP"; |