Tweak comment.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 8063603a293a820bfd1b23416309095896548ab9..78686a17bf16ffe6ec59ef62c464f64a26042f0b 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,11 +96,11 @@ Asset::mxf_path () const
 }
 
 list<string>
-Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
+Asset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
 {
        list<string> notes;
        
-       if (flags & LIBDCP_METADATA) {
+       if (opt.flags & LIBDCP_METADATA) {
                if (_mxf_name != other->_mxf_name) {
                        notes.push_back ("MXF names differ");
                }
@@ -112,9 +112,9 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                }
        }
        
-       if (flags & MXF_BITWISE) {
+       if (opt.flags & MXF_BITWISE) {
 
-               if (_digest != other->_digest) {
+               if (digest() != other->digest()) {
                        notes.push_back ("MXF digests differ");
                }
                
@@ -123,8 +123,8 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                        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];
@@ -148,3 +148,17 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
 
        return notes;
 }
+
+string
+Asset::digest () const
+{
+       if (_digest.empty ()) {
+               _digest = make_digest (mxf_path().string(), 0);
+       }
+
+       return _digest;
+}
+
+               
+               
+