diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-12-02 21:52:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-12-02 21:52:38 +0100 |
| commit | d5e6fa029f1fb7b7dccd32dd2906a0858a876cae (patch) | |
| tree | 395c99c9b4792e49f2adfbf227d2f4541a960c1b | |
| parent | e21a8bc77f80374a78085c492e4dd14315457e5f (diff) | |
Don't use "NR" in the ISDCF name if there is no rating.
Thierry says this is not used out in the wild, and I can't find
any reference to say that it must be there, so remove it.
| -rw-r--r-- | src/lib/film.cc | 4 | ||||
| -rw-r--r-- | test/isdcf_name_test.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 8b1442849..29952d0f2 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -970,9 +970,7 @@ Film::isdcf_name (bool if_created_now) const if (_release_territory) { auto territory = _release_territory->subtag(); isdcf_name += "_" + to_upper (territory); - if (_ratings.empty ()) { - isdcf_name += "-NR"; - } else { + if (!_ratings.empty()) { auto label = _ratings[0].label; boost::erase_all(label, "+"); boost::erase_all(label, "-"); diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index d64f45b89..b15612895 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -232,5 +232,10 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) /* Check that the proper codes are used, not just part of the language code; in this case, QBP instead of PT (#2235) */ film->set_audio_language(dcp::LanguageTag("pt-BR")); BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_QBP-fr_US-R_71-HI-VI_4K_DI_20140704_PPF_SMPTE_OV"); + + /* Check that nothing is added for non-existant ratings */ + film->set_ratings({}); + BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_QBP-fr_US_71-HI-VI_4K_DI_20140704_PPF_SMPTE_OV"); + } |