summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-07-31 01:08:50 +0100
committerCarl Hetherington <cth@carlh.net>2012-07-31 01:08:50 +0100
commit72d6b15182a2f43cccd99fef03e69583d8dd6e78 (patch)
tree8b170acffd57db36063ecbf72733924211991ab7 /src/dcp.cc
parentda2f0d96f3c5ffa73bfecd9df613b23200e862f7 (diff)
Metadata checking for MXFs.
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc26
1 files changed, 11 insertions, 15 deletions
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;