diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:22:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-04 20:22:47 +0000 |
| commit | 1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33 (patch) | |
| tree | d60b9fb573dd8d6ab89036fb8788cd1b1c69aada /src/lib/content.cc | |
| parent | 6d8bcba724be622739a749064466901486304cee (diff) | |
New DCPTime/ContentTime types.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 8e3b99da8..4493c67c0 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -83,9 +83,9 @@ Content::Content (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node) _paths.push_back ((*i)->content ()); } _digest = node->string_child ("Digest"); - _position = node->number_child<DCPTime> ("Position"); - _trim_start = node->number_child<DCPTime> ("TrimStart"); - _trim_end = node->number_child<DCPTime> ("TrimEnd"); + _position = DCPTime (node->number_child<double> ("Position")); + _trim_start = DCPTime (node->number_child<double> ("TrimStart")); + _trim_end = DCPTime (node->number_child<double> ("TrimEnd")); } Content::Content (shared_ptr<const Film> f, vector<shared_ptr<Content> > c) @@ -119,9 +119,9 @@ Content::as_xml (xmlpp::Node* node) const node->add_child("Path")->add_child_text (i->string ()); } node->add_child("Digest")->add_child_text (_digest); - node->add_child("Position")->add_child_text (lexical_cast<string> (_position)); - node->add_child("TrimStart")->add_child_text (lexical_cast<string> (_trim_start)); - node->add_child("TrimEnd")->add_child_text (lexical_cast<string> (_trim_end)); + node->add_child("Position")->add_child_text (lexical_cast<string> (_position.get ())); + node->add_child("TrimStart")->add_child_text (lexical_cast<string> (_trim_start.get ())); + node->add_child("TrimEnd")->add_child_text (lexical_cast<string> (_trim_end.get ())); } void |