diff options
Diffstat (limited to 'src/reel.cc')
| -rw-r--r-- | src/reel.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/reel.cc b/src/reel.cc index d8703dd0..3f077269 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -28,12 +28,12 @@ using namespace std; using namespace libdcp; void -Reel::write_to_cpl (xmlpp::Node* parent) const +Reel::write_to_cpl (xmlpp::Node* node) const { - xmlpp::Element* reel = parent->add_child("Reel"); - reel->add_child("Id")->add_child_text("urn:uuid:" + make_uuid()); - xmlpp::Element* asset_list = reel->add_child("AssetList"); - + xmlpp::Node* reel = node->add_child ("Reel"); + reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid()); + xmlpp::Node* asset_list = reel->add_child ("AssetList"); + if (_main_picture) { _main_picture->write_to_cpl (asset_list); } @@ -48,32 +48,32 @@ Reel::write_to_cpl (xmlpp::Node* parent) const } bool -Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, list<string>& notes) const +Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const { if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) { - notes.push_back ("reel has different assets"); + note (ERROR, "reel has different assets"); return false; } - if (_main_picture && !_main_picture->equals (other->_main_picture, opt, notes)) { + if (_main_picture && !_main_picture->equals (other->_main_picture, opt, note)) { return false; } if ((_main_sound && !other->_main_sound) || (!_main_sound && other->_main_sound)) { - notes.push_back ("reel has different assets"); + note (ERROR, "reel has different assets"); return false; } - if (_main_sound && !_main_sound->equals (other->_main_sound, opt, notes)) { + if (_main_sound && !_main_sound->equals (other->_main_sound, opt, note)) { return false; } if ((_main_subtitle && !other->_main_subtitle) || (!_main_subtitle && other->_main_subtitle)) { - notes.push_back ("reel has different assets"); + note (ERROR, "reel has different assets"); return false; } - if (_main_subtitle && !_main_subtitle->equals (other->_main_subtitle, opt, notes)) { + if (_main_subtitle && !_main_subtitle->equals (other->_main_subtitle, opt, note)) { return false; } |