From f188fc8d92eaba89aaa63cfd7f5a2fc9836e94b6 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 2 Apr 2021 22:38:16 +0200
Subject: Use release territory from Interop/SMPTE metadata instead of ISDCF
 metadata dialogue.

---
 src/lib/film.cc           | 6 ++++--
 src/lib/isdcf_metadata.cc | 7 ++-----
 src/lib/isdcf_metadata.h  | 1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5ccc5437a..9051c5a15 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -957,8 +957,10 @@ Film::isdcf_name (bool if_created_now) const
 		d += "-XX";
 	}
 
-	if (!dm.territory.empty ()) {
-		d += "_" + dm.territory;
+	if (_release_territory) {
+		auto territory = _release_territory->subtag();
+		transform (territory.begin(), territory.end(), territory.begin(), ::toupper);
+		d += "_" + territory;
 		if (dm.rating.empty ()) {
 			d += "-NR";
 		} else {
diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 4f157ce70..daf3a4c4f 100644
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -34,8 +34,7 @@ using std::shared_ptr;
 using dcp::raw_convert;
 
 ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
-	: territory (node->string_child ("Territory"))
-	, rating (node->string_child ("Rating"))
+	: rating (node->string_child ("Rating"))
 	, studio (node->string_child ("Studio"))
 	, facility (node->string_child ("Facility"))
 	/* This stuff was added later */
@@ -52,7 +51,6 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node)
 void
 ISDCFMetadata::as_xml (xmlpp::Node* root) const
 {
-	root->add_child("Territory")->add_child_text (territory);
 	root->add_child("Rating")->add_child_text (rating);
 	root->add_child("Studio")->add_child_text (studio);
 	root->add_child("Facility")->add_child_text (facility);
@@ -67,8 +65,7 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const
 bool
 operator== (ISDCFMetadata const & a, ISDCFMetadata const & b)
 {
-        return a.territory == b.territory &&
-               a.rating == b.rating &&
+        return a.rating == b.rating &&
                a.studio == b.studio &&
                a.facility == b.facility &&
                a.temp_version == b.temp_version &&
diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h
index 22c418c6e..3dc2c2d35 100644
--- a/src/lib/isdcf_metadata.h
+++ b/src/lib/isdcf_metadata.h
@@ -43,7 +43,6 @@ public:
 	void as_xml (xmlpp::Node *) const;
 	void read_old_metadata (std::string, std::string);
 
-	std::string territory;
 	std::string rating;
 	std::string studio;
 	std::string facility;
-- 
cgit v1.2.3