diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-31 23:42:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-31 23:42:16 +0100 |
| commit | bbb2a4b7ccec953900d13e7bcdad229028bc7795 (patch) | |
| tree | b8cff6e8d8885f7b26c020e7bf242f1f202fe5f4 /src/lib/config.cc | |
| parent | 7cc1c3108a1b9358aff2108a159d0c910130683b (diff) | |
Stop CPL <Creator> tag being configurable and use DCP-o-matic version number instead.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 04f28579b..67abc63c2 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -150,9 +150,12 @@ Config::read () _default_dcp_content_type = DCPContentType::from_isdcf_name (c.get ()); } - _dcp_metadata.issuer = f.optional_string_child ("DCPMetadataIssuer").get_value_or (""); - _dcp_metadata.creator = f.optional_string_child ("DCPMetadataCreator").get_value_or (""); - + if (f.optional_string_child ("DCPMetadataIssuer")) { + _dcp_issuer = f.string_child ("DCPMetadataIssuer"); + } else if (f.optional_string_child ("DCPIssuer")) { + _dcp_issuer = f.string_child ("DCPIssuer"); + } + if (version && version.get() >= 2) { _default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata")); } else { @@ -266,11 +269,7 @@ Config::read_old_metadata () } else if (k == "default_dcp_content_type") { _default_dcp_content_type = DCPContentType::from_isdcf_name (v); } else if (k == "dcp_metadata_issuer") { - _dcp_metadata.issuer = v; - } else if (k == "dcp_metadata_creator") { - _dcp_metadata.creator = v; - } else if (k == "dcp_metadata_issue_date") { - _dcp_metadata.issue_date = v; + _dcp_issuer = v; } _default_isdcf_metadata.read_old_metadata (k, v); @@ -363,8 +362,7 @@ Config::write () const if (_default_dcp_content_type) { root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ()); } - root->add_child("DCPMetadataIssuer")->add_child_text (_dcp_metadata.issuer); - root->add_child("DCPMetadataCreator")->add_child_text (_dcp_metadata.creator); + root->add_child("DCPIssuer")->add_child_text (_dcp_issuer); _default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata")); |