diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-01 00:06:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-01 00:06:19 +0100 |
| commit | cf8bbea2de38c4e9ac140f55b27311b7b6dcd814 (patch) | |
| tree | 7786cf4672ce8c5134c5b9e53947609a1e1c9cc3 /src/lib/config.cc | |
| parent | 22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5 (diff) | |
| parent | bbb2a4b7ccec953900d13e7bcdad229028bc7795 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 7e3762587..1f5a25ae4 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -160,9 +160,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 { @@ -335,8 +338,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")); |