diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-02 23:45:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-04 20:48:35 +0200 |
| commit | ea51ac3483161343b7aefabe54420c6cb431c0fe (patch) | |
| tree | d795c52c13989af628a28abad11d91c2d14f2405 /src/lib/isdcf_metadata.cc | |
| parent | 48bfa4b2040d2bacd6befdab6c12b2ee3e9be5a1 (diff) | |
Use studio and facility from Interop/SMPTE metadata rather than ISDCF.
Diffstat (limited to 'src/lib/isdcf_metadata.cc')
| -rw-r--r-- | src/lib/isdcf_metadata.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc index c190ba3dc..eb8bcb1a5 100644 --- a/src/lib/isdcf_metadata.cc +++ b/src/lib/isdcf_metadata.cc @@ -34,10 +34,7 @@ using std::shared_ptr; using dcp::raw_convert; ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node) - : 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)) + : temp_version (node->optional_bool_child ("TempVersion").get_value_or (false)) , pre_release (node->optional_bool_child ("PreRelease").get_value_or (false)) , red_band (node->optional_bool_child ("RedBand").get_value_or (false)) , chain (node->optional_string_child ("Chain").get_value_or ("")) @@ -50,8 +47,6 @@ ISDCFMetadata::ISDCFMetadata (cxml::ConstNodePtr node) void ISDCFMetadata::as_xml (xmlpp::Node* root) const { - 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"); root->add_child("PreRelease")->add_child_text (pre_release ? "1" : "0"); root->add_child("RedBand")->add_child_text (red_band ? "1" : "0"); @@ -63,9 +58,7 @@ ISDCFMetadata::as_xml (xmlpp::Node* root) const bool operator== (ISDCFMetadata const & a, ISDCFMetadata const & b) { - return a.studio == b.studio && - a.facility == b.facility && - a.temp_version == b.temp_version && + return a.temp_version == b.temp_version && a.pre_release == b.pre_release && a.red_band == b.red_band && a.chain == b.chain && |