diff options
Diffstat (limited to 'src/lib/image_content.cc')
| -rw-r--r-- | src/lib/image_content.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 1a92c944e..e7ba88194 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -43,6 +43,7 @@ using std::make_shared; using std::shared_ptr; using std::string; using std::vector; +using boost::optional; using namespace dcpomatic; @@ -60,8 +61,8 @@ ImageContent::ImageContent (boost::filesystem::path p) } -ImageContent::ImageContent (cxml::ConstNodePtr node, int version) - : Content (node) +ImageContent::ImageContent(cxml::ConstNodePtr node, boost::optional<boost::filesystem::path> film_directory, int version) + : Content(node, film_directory) { video = VideoContent::from_xml (this, node, version, VideoRange::FULL); } @@ -99,13 +100,13 @@ ImageContent::technical_summary () const void -ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const +ImageContent::as_xml(xmlpp::Element* element, bool with_paths, PathBehaviour path_behaviour, optional<boost::filesystem::path> film_directory) const { - node->add_child("Type")->add_child_text ("Image"); - Content::as_xml (node, with_paths); + cxml::add_text_child(element, "Type", "Image"); + Content::as_xml(element, with_paths, path_behaviour, film_directory); if (video) { - video->as_xml (node); + video->as_xml(element); } } |