/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "atmos_content.h"
#include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
+using std::make_shared;
using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
int const AtmosContentProperty::EDIT_RATE = 700;
AtmosContent::AtmosContent (Content* parent, cxml::ConstNodePtr node)
: ContentPart (parent)
{
- _length = node->number_child<Frame>("Length");
- _edit_rate = dcp::Fraction (node->string_child("EditRate"));
+ _length = node->number_child<Frame>("AtmosLength");
+ _edit_rate = dcp::Fraction (node->string_child("AtmosEditRate"));
}
shared_ptr<AtmosContent>
AtmosContent::from_xml (Content* parent, cxml::ConstNodePtr node)
{
- return shared_ptr<AtmosContent> (new AtmosContent(parent, node));
+ if (!node->optional_node_child("AtmosLength")) {
+ return {};
+ }
+
+ return make_shared<AtmosContent>(parent, node);
}
void
AtmosContent::as_xml (xmlpp::Node* node) const
{
- node->add_child("Length")->add_child_text(dcp::raw_convert<string>(_length));
- node->add_child("EditRate")->add_child_text(_edit_rate.as_string());
+ node->add_child("AtmosLength")->add_child_text(dcp::raw_convert<string>(_length));
+ node->add_child("AtmosEditRate")->add_child_text(_edit_rate.as_string());
}