diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-03 02:02:53 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-04 20:48:35 +0200 |
| commit | 4b8b74ae8ae721f2fbf317f1d7ce5be6048ae1b0 (patch) | |
| tree | 657138b1d1254363719f674230bb41b26d2cd311 /src/lib | |
| parent | 8d9e73b753ed51067d93aa377bb24400ff22936e (diff) | |
Move chain to the Interop/SMPTE metadata.
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 | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 9857dc1f1..147470585 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -886,8 +886,8 @@ Film::isdcf_name (bool if_created_now) const d += "-RedBand"; } - if (!dm.chain.empty ()) { - d += "-" + dm.chain; + if (_chain && !_chain->empty()) { + d += "-" + *_chain; } if (three_d ()) { diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc index 71f1fc6d0..22e094b1b 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) - : chain (node->optional_string_child ("Chain").get_value_or ("")) - , mastered_luminance (node->optional_string_child ("MasteredLuminance").get_value_or ("")) + : mastered_luminance (node->optional_string_child ("MasteredLuminance").get_value_or ("")) { } @@ -43,13 +42,11 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node) void ISDCFMetadata::as_xml (xmlpp::Node* root) const { - root->add_child("Chain")->add_child_text (chain); root->add_child("MasteredLuminance")->add_child_text (mastered_luminance); } bool operator== (ISDCFMetadata const & a, ISDCFMetadata const & b) { - return a.chain == b.chain && - a.mastered_luminance == b.mastered_luminance; + return a.mastered_luminance == b.mastered_luminance; } diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h index 722bb154f..4237b6a3e 100644 --- a/src/lib/isdcf_metadata.h +++ b/src/lib/isdcf_metadata.h @@ -37,8 +37,6 @@ public: void as_xml (xmlpp::Node *) const; void read_old_metadata (std::string, std::string); - /** specific theatre chain or event */ - std::string chain; /** mastered luminance if there are multiple versions distributed (e.g. 35, 4fl, 6fl etc.) */ std::string mastered_luminance; }; |