From: Carl Hetherington <cth@carlh.net>
Date: Fri, 2 Dec 2022 20:52:38 +0000 (+0100)
Subject: Don't use "NR" in the ISDCF name if there is no rating.
X-Git-Tag: v2.16.36~35
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d5e6fa029f1fb7b7dccd32dd2906a0858a876cae

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.
---

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");
+
 }