diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:37:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:37:15 +0000 |
| commit | 51cc8f575b55f2a21d8503965b628c0f59f1ed33 (patch) | |
| tree | 7931d7c75bdf97d566056610cecffaf24b2c9bf4 /src/lib/content.cc | |
| parent | c008066160d85b9ec9e5485375d7baaa5d27bda2 (diff) | |
Hand-apply d3bc61f0af33fedf02ac1a28cf91989ee9cd2fb6 from master;
make digest optional.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 6e0218323..ec16b9610 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -89,7 +89,7 @@ Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node) for (list<cxml::NodePtr>::const_iterator i = path_children.begin(); i != path_children.end(); ++i) { _paths.push_back ((*i)->content ()); } - _digest = node->string_child ("Digest"); + _digest = node->optional_string_child ("Digest"); _position = DCPTime (node->number_child<double> ("Position")); _trim_start = DCPTime (node->number_child<double> ("TrimStart")); _trim_end = DCPTime (node->number_child<double> ("TrimEnd")); @@ -125,7 +125,9 @@ Content::as_xml (xmlpp::Node* node) const for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) { node->add_child("Path")->add_child_text (i->string ()); } - node->add_child("Digest")->add_child_text (_digest); + if (_digest) { + node->add_child("Digest")->add_child_text (_digest.get ()); + } node->add_child("Position")->add_child_text (raw_convert<string> (_position.get ())); node->add_child("TrimStart")->add_child_text (raw_convert<string> (_trim_start.get ())); node->add_child("TrimEnd")->add_child_text (raw_convert<string> (_trim_end.get ())); |