Windows build fixes.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 13f8bf70b9251ca4ac124d8559a54ef700b6ad41..f8362c8b16ca61c16d18e7e8eb32b4fac6dd3854 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -51,7 +51,7 @@ Asset::write_to_pkl (ostream& s) const
        s << "    <Asset>\n"
          << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
          << "      <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
-         << "      <Hash>" << _digest << "</Hash>\n"
+         << "      <Hash>" << digest() << "</Hash>\n"
          << "      <Size>" << filesystem::file_size(mxf_path()) << "</Size>\n"
          << "      <Type>application/mxf</Type>\n"
          << "    </Asset>\n";
@@ -96,33 +96,35 @@ 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) {
-                       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 (digest() != other->digest()) {
+                       notes.push_back ("MXF digests 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 a (mxf_path().string().c_str(), ios::binary);
+               ifstream b (other->mxf_path().string().c_str(), ios::binary);
 
                int buffer_size = 65536;
                char abuffer[buffer_size];
@@ -135,11 +137,9 @@ Asset::equals (Asset const & other, EqualityFlags flags) const
                        a.read (abuffer, t);
                        b.read (bbuffer, t);
 
-                       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");
-                                       return notes;
-                               }
+                       if (memcmp (abuffer, bbuffer, t) != 0) {
+                               notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " content differs");
+                               return notes;
                        }
 
                        n -= t;
@@ -148,3 +148,17 @@ Asset::equals (Asset const & other, EqualityFlags flags) const
 
        return notes;
 }
+
+string
+Asset::digest () const
+{
+       if (_digest.empty ()) {
+               _digest = make_digest (mxf_path().string(), 0);
+       }
+
+       return _digest;
+}
+
+               
+               
+