projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OK note when PKL and CPL annotation texts match.
[libdcp.git]
/
src
/
reel_picture_asset.cc
diff --git
a/src/reel_picture_asset.cc
b/src/reel_picture_asset.cc
index 2e51fec5828707f3a60eefe061a0c163956fec91..7ee5fa38fe5c2ef3d1b4b6c123ffbd434942be39 100644
(file)
--- a/
src/reel_picture_asset.cc
+++ b/
src/reel_picture_asset.cc
@@
-86,12
+86,12
@@
ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
}
}
-xmlpp::
Node
*
-ReelPictureAsset::write_to_cpl
(xmlpp::Node
* node, Standard standard) const
+xmlpp::
Element
*
+ReelPictureAsset::write_to_cpl
(xmlpp::Element
* node, Standard standard) const
{
auto asset = ReelFileAsset::write_to_cpl (node, standard);
{
auto asset = ReelFileAsset::write_to_cpl (node, standard);
-
asset->add_child("FrameRate")->add_child_text(
String::compose("%1 %2", _frame_rate.numerator, _frame_rate.denominator));
+
cxml::add_text_child(asset, "FrameRate",
String::compose("%1 %2", _frame_rate.numerator, _frame_rate.denominator));
if (standard == Standard::INTEROP) {
if (standard == Standard::INTEROP) {
@@
-113,10
+113,12
@@
ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
}
}
}
}
-
asset->add_child("ScreenAspectRatio")->add_child_text(
raw_convert<string>(closest.get(), 2, true));
+
cxml::add_text_child(asset, "ScreenAspectRatio",
raw_convert<string>(closest.get(), 2, true));
} else {
} else {
- asset->add_child("ScreenAspectRatio")->add_child_text(
- String::compose ("%1 %2", _screen_aspect_ratio.numerator, _screen_aspect_ratio.denominator)
+ cxml::add_text_child(
+ asset,
+ "ScreenAspectRatio",
+ String::compose("%1 %2", _screen_aspect_ratio.numerator, _screen_aspect_ratio.denominator)
);
}
);
}
@@
-125,7
+127,7
@@
ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
bool
bool
-ReelPictureAsset::equals
(shared_ptr<const ReelPictureAsset> other, EqualityOptions
opt, NoteHandler note) const
+ReelPictureAsset::equals
(shared_ptr<const ReelPictureAsset> other, EqualityOptions const&
opt, NoteHandler note) const
{
if (!asset_equals (other, opt, note)) {
return false;
{
if (!asset_equals (other, opt, note)) {
return false;