Cleanup: header ordering.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index b69e68e8589d53c7e3e94cd09bee8525e5fdb5d8..213d4878410e2553f7b48963da1ea185432d9f06 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -41,6 +41,7 @@
 #include "asset_map.h"
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "equality_options.h"
 #include "exceptions.h"
 #include "pkl.h"
 #include "raw_convert.h"
@@ -143,11 +144,15 @@ Asset::hash (function<void (float)> progress) const
 
 
 bool
-Asset::equals (std::shared_ptr<const Asset> other, EqualityOptions, NoteHandler note) const
+Asset::equals(std::shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
        if (_hash != other->_hash) {
-               note (NoteType::ERROR, "Asset: hashes differ");
-               return false;
+               if (!opt.asset_hashes_can_differ) {
+                       note(NoteType::ERROR, "Asset: hashes differ");
+                       return false;
+               } else {
+                       note(NoteType::NOTE, "Asset: hashes differ");
+               }
        }
 
        return true;
@@ -158,7 +163,7 @@ void
 Asset::set_file (path file) const
 {
        _file = absolute (file);
-       _hash = boost::optional<string>();
+       _hash = optional<string>();
 }
 
 
@@ -181,3 +186,11 @@ Asset::set_hash (string hash)
 {
        _hash = hash;
 }
+
+
+void
+Asset::unset_hash()
+{
+       _hash = optional<string>();
+}
+