Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 6bf8fec5dcc1fc70dc65596d8df381e9b5d859b3..e55dca2dab05999c58d9c65d93efe330f9c1acf0 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -39,8 +39,7 @@ Asset::Asset ()
 
 }
 
-/** Create an Asset from a given file.  The ID will
- *  be extracted from the file.
+/** Create an Asset from a given file.
  *  @param file File name.
  */
 Asset::Asset (boost::filesystem::path file)
@@ -106,7 +105,7 @@ bool
 Asset::equals (boost::shared_ptr<const Asset> other, EqualityOptions, function<void (NoteType, string)> note) const
 {
        if (_hash != other->_hash) {
-               note (ERROR, "Asset hashes differ");
+               note (DCP_ERROR, "Asset hashes differ");
                return false;
        }