diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-31 10:37:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-31 10:37:56 +0100 |
| commit | aaa33afbc17d60f9e836b4a2ad2e7ec2c294b837 (patch) | |
| tree | 12a4815111b33da6cc8611e576154c3a1ad29810 /src/asset.cc | |
| parent | 72d6b15182a2f43cccd99fef03e69583d8dd6e78 (diff) | |
Tweak.
Diffstat (limited to 'src/asset.cc')
| -rw-r--r-- | src/asset.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/asset.cc b/src/asset.cc index 13f8bf70..4b02774c 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -96,33 +96,33 @@ Asset::mxf_path () const } list<string> -Asset::equals (Asset const & other, EqualityFlags flags) const +Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const { list<string> notes; if (flags & LIBDCP_METADATA) { - if (_mxf_name != other._mxf_name) { + if (_mxf_name != other->_mxf_name) { notes.push_back ("MXF names differ"); } - if (_fps != other._fps) { + if (_fps != other->_fps) { notes.push_back ("MXF frames per second differ"); } - if (_length != other._length) { + if (_length != other->_length) { notes.push_back ("MXF lengths differ"); } - if (_digest != other._digest) { + if (_digest != other->_digest) { notes.push_back ("MXF digests differ"); } } if (flags & MXF_BITWISE) { - if (filesystem::file_size (mxf_path()) != filesystem::file_size (other.mxf_path())) { - notes.push_back (mxf_path().string() + " and " + other.mxf_path().string() + " sizes differ"); + if (filesystem::file_size (mxf_path()) != filesystem::file_size (other->mxf_path())) { + notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " sizes differ"); return notes; } ifstream a (mxf_path().c_str(), ios::binary); - ifstream b (other.mxf_path().c_str(), ios::binary); + ifstream b (other->mxf_path().c_str(), ios::binary); int buffer_size = 65536; char abuffer[buffer_size]; @@ -137,7 +137,7 @@ Asset::equals (Asset const & other, EqualityFlags flags) const for (int i = 0; i < t; ++i) { if (abuffer[i] != bbuffer[i]) { - notes.push_back (mxf_path().string() + " and " + other.mxf_path().string() + " content differs"); + notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " content differs"); return notes; } } @@ -146,5 +146,9 @@ Asset::equals (Asset const & other, EqualityFlags flags) const } } + if (flags & MXF_INSPECT) { + + } + return notes; } |