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_subtitle_asset.cc
diff --git
a/src/reel_subtitle_asset.cc
b/src/reel_subtitle_asset.cc
index 04f5678801b9d65b6fd7604aeb95f6da4b952641..436aa69f6c84458589d5c7eee36c37ed5770949b 100644
(file)
--- a/
src/reel_subtitle_asset.cc
+++ b/
src/reel_subtitle_asset.cc
@@
-90,7
+90,7
@@
ReelSubtitleAsset::set_language (dcp::LanguageTag language)
bool
bool
-ReelSubtitleAsset::equals
(shared_ptr<const ReelSubtitleAsset> other, EqualityOptions
opt, NoteHandler note) const
+ReelSubtitleAsset::equals
(shared_ptr<const ReelSubtitleAsset> other, EqualityOptions const&
opt, NoteHandler note) const
{
if (!asset_equals (other, opt, note)) {
return false;
{
if (!asset_equals (other, opt, note)) {
return false;
@@
-103,12
+103,12
@@
ReelSubtitleAsset::equals (shared_ptr<const ReelSubtitleAsset> other, EqualityOp
}
}
-xmlpp::
Node
*
-ReelSubtitleAsset::write_to_cpl
(xmlpp::Node
* node, Standard standard) const
+xmlpp::
Element
*
+ReelSubtitleAsset::write_to_cpl
(xmlpp::Element
* node, Standard standard) const
{
auto asset = ReelFileAsset::write_to_cpl (node, standard);
if (_language) {
{
auto asset = ReelFileAsset::write_to_cpl (node, standard);
if (_language) {
-
asset->add_child("Language")->add_child_text(
*_language);
+
cxml::add_text_child(asset, "Language",
*_language);
}
return asset;
}
}
return asset;
}