summaryrefslogtreecommitdiff
path: root/src/reel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-15 13:38:14 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-15 13:38:14 +0100
commit6322c72a13d7be2e991a8e0421414c0af8187b88 (patch)
treeb4ca07d1f00016bcd407152202ab408b59f093d4 /src/reel.cc
parent4709841e68d860c4fbee2f2f824e57489c8ad97d (diff)
Use boost::function for making notes during equals operations.
Diffstat (limited to 'src/reel.cc')
-rw-r--r--src/reel.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/reel.cc b/src/reel.cc
index 8995f874..096acf19 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -50,32 +50,32 @@ Reel::write_to_cpl (ostream& s) 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 (string)> note) const
{
if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) {
- notes.push_back ("reel has different assets");
+ note ("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 ("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 ("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;
}