summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-15 13:48:22 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-15 13:48:22 +0100
commit034abb6bb0f1d0382620bdcc43501ce0ba30b03a (patch)
tree862347349d48e3afae6190e60fbc2d0cfa88f23c /src/dcp.cc
parent6322c72a13d7be2e991a8e0421414c0af8187b88 (diff)
Try to give basic progress indication on dcpdiff.
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 49d41c70..bac266ab 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -248,10 +248,10 @@ DCP::read (bool require_mxfs)
}
bool
-DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (string)> note) const
+DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
{
if (_cpls.size() != other._cpls.size()) {
- note ("CPL counts differ");
+ note (ERROR, "CPL counts differ");
return false;
}
@@ -516,30 +516,30 @@ CPL::write_to_assetmap (ostream& s) const
bool
-CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (string)> note) const
+CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
{
if (_name != other._name) {
- note ("names differ");
+ note (ERROR, "names differ");
return false;
}
if (_content_kind != other._content_kind) {
- note ("content kinds differ");
+ note (ERROR, "content kinds differ");
return false;
}
if (_fps != other._fps) {
- note ("frames per second differ");
+ note (ERROR, "frames per second differ");
return false;
}
if (_length != other._length) {
- note ("lengths differ");
+ note (ERROR, "lengths differ");
return false;
}
if (_reels.size() != other._reels.size()) {
- note ("reel counts differ");
+ note (ERROR, "reel counts differ");
return false;
}