From 72d6b15182a2f43cccd99fef03e69583d8dd6e78 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 31 Jul 2012 01:08:50 +0100
Subject: Metadata checking for MXFs.

---
 src/dcp.cc | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/dcp.cc')

diff --git a/src/dcp.cc b/src/dcp.cc
index ed63170f..67c56f99 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -324,22 +324,18 @@ DCP::equals (DCP const & other, EqualityFlags flags) const
 		}
 	}
 
-	if (flags & LIBDCP_METADATA || flags & MXF_BITWISE) {
-		if (_assets.size() != other._assets.size()) {
-			notes.push_back ("asset counts differ");
-		}
+	if (_assets.size() != other._assets.size()) {
+		notes.push_back ("asset counts differ");
 	}
-
-	if (flags & MXF_BITWISE) {
-		list<shared_ptr<Asset> >::const_iterator a = _assets.begin ();
-		list<shared_ptr<Asset> >::const_iterator b = other._assets.begin ();
-
-		while (a != _assets.end ()) {
-			list<string> n = (*a)->equals (*b->get(), MXF_BITWISE);
-			notes.merge (n);
-			++a;
-			++b;
-		}
+	
+	list<shared_ptr<Asset> >::const_iterator a = _assets.begin ();
+	list<shared_ptr<Asset> >::const_iterator b = other._assets.begin ();
+	
+	while (a != _assets.end ()) {
+		list<string> n = (*a)->equals (*b->get(), flags);
+		notes.merge (n);
+		++a;
+		++b;
 	}
 
 	return notes;
-- 
cgit v1.2.3