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 /src/lib | |
| parent | 60520afb4a6bb364c981c2b6976805d4128ac81f (diff) | |
Use release territory from Interop/SMPTE metadata instead of ISDCF metadata dialogue.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 6 | ||||
| -rw-r--r-- | src/lib/isdcf_metadata.cc | 7 | ||||
| -rw-r--r-- | src/lib/isdcf_metadata.h | 1 |
3 files changed, 6 insertions, 8 deletions
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; |