summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-01 15:03:30 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-01 15:03:30 +0100
commit9292ce1176d68f31ad1fbbe358563b79c8ec9088 (patch)
tree1d0ebe0d52251e1aadefa87b89be0ce2202ab74d
parent95d1bfda7b310c70da7f8ce467b7d1eb7d02469c (diff)
Slightly more informative output from diff.
-rw-r--r--src/cpl.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/cpl.cc b/src/cpl.cc
index 02530357..685454df 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -28,6 +28,7 @@
#include "reel.h"
#include "metadata.h"
#include "exceptions.h"
+#include "compose.hpp"
using std::string;
using std::stringstream;
@@ -270,17 +271,19 @@ CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteT
}
if (_fps != other._fps) {
- note (ERROR, "frames per second differ");
+ note (ERROR, String::compose ("frames per second differ (%1 vs %2)", _fps, other._fps));
return false;
}
if (_length != other._length) {
- note (ERROR, "lengths differ");
+ stringstream s;
+ s << "lengths differ (" << _length << " cf " << other._length << ")";
+ note (ERROR, String::compose ("lengths differ (%1 vs %2)", _length, other._length));
return false;
}
if (_reels.size() != other._reels.size()) {
- note (ERROR, "reel counts differ");
+ note (ERROR, String::compose ("reel counts differ (%1 vs %2)", _reels.size(), other._reels.size()));
return false;
}