diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-02 23:05:05 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-04 20:48:35 +0200 |
| commit | b0c9c0470708d0822631b82915f4ed67e5fc7c1b (patch) | |
| tree | 1bb8f0e222206d3247d31036afe92aa23fd686e4 /src/lib | |
| parent | bb9a4a46266f705142a8aca41a092445a02debf0 (diff) | |
Use ratings from Interop/SMPTE metadata instead of ISDCF metadata dialogue.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 4 | ||||
| -rw-r--r-- | src/lib/isdcf_metadata.cc | 7 | ||||
| -rw-r--r-- | src/lib/isdcf_metadata.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 9051c5a15..b34c85295 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -961,10 +961,10 @@ Film::isdcf_name (bool if_created_now) const auto territory = _release_territory->subtag(); transform (territory.begin(), territory.end(), territory.begin(), ::toupper); d += "_" + territory; - if (dm.rating.empty ()) { + if (_ratings.empty ()) { d += "-NR"; } else { - d += "-" + dm.rating; + d += "-" + _ratings[0].label; } } diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc index daf3a4c4f..c190ba3dc 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) - : rating (node->string_child ("Rating")) - , studio (node->string_child ("Studio")) + : studio (node->string_child ("Studio")) , facility (node->string_child ("Facility")) /* This stuff was added later */ , temp_version (node->optional_bool_child ("TempVersion").get_value_or (false)) @@ -51,7 +50,6 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node) void ISDCFMetadata::as_xml (xmlpp::Node* root) const { - root->add_child("Rating")->add_child_text (rating); root->add_child("Studio")->add_child_text (studio); root->add_child("Facility")->add_child_text (facility); root->add_child("TempVersion")->add_child_text (temp_version ? "1" : "0"); @@ -65,8 +63,7 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const bool operator== (ISDCFMetadata const & a, ISDCFMetadata const & b) { - return a.rating == b.rating && - a.studio == b.studio && + return a.studio == b.studio && a.facility == b.facility && a.temp_version == b.temp_version && a.pre_release == b.pre_release && diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h index 3dc2c2d35..1c80e7b5d 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 rating; std::string studio; std::string facility; /** true if this is a temporary version (without final picture or sound) */ |