Tweak comment.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 92b235d88ca63ca59ae67bc9741ca2e22896cc96..78686a17bf16ffe6ec59ef62c464f64a26042f0b 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -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,7 +112,7 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                }
        }
        
-       if (flags & MXF_BITWISE) {
+       if (opt.flags & MXF_BITWISE) {
 
                if (digest() != other->digest()) {
                        notes.push_back ("MXF digests differ");
@@ -122,14 +122,9 @@ Asset::equals (shared_ptr<const Asset> other, EqualityFlags flags) const
                        notes.push_back (mxf_path().string() + " and " + other->mxf_path().string() + " sizes differ");
                        return notes;
                }
-
-#if BOOST_FILESYSTEM_VERSION == 3
-               ifstream a (mxf_path().c_str(), ios::binary);
-               ifstream b (other->mxf_path().c_str(), ios::binary);
-#else
+               
                ifstream a (mxf_path().string().c_str(), ios::binary);
                ifstream b (other->mxf_path().string().c_str(), ios::binary);
-#endif         
 
                int buffer_size = 65536;
                char abuffer[buffer_size];