From 95d1bfda7b310c70da7f8ce467b7d1eb7d02469c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 20 Jun 2013 11:19:21 +0000
Subject: Include trimming.

---
 src/cpl.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/cpl.cc')

diff --git a/src/cpl.cc b/src/cpl.cc
index fd705680..02530357 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -27,6 +27,7 @@
 #include "parse/asset_map.h"
 #include "reel.h"
 #include "metadata.h"
+#include "exceptions.h"
 
 using std::string;
 using std::stringstream;
-- 
cgit v1.2.3


From 9292ce1176d68f31ad1fbbe358563b79c8ec9088 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 1 Jul 2013 15:03:30 +0100
Subject: Slightly more informative output from diff.

---
 src/cpl.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/cpl.cc')

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;
 	}
 	
-- 
cgit v1.2.3