X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.h;h=2712dcb889d08538b7b1cfbff9c910961a8c38aa;hb=491ac453512ac1982f62fc0d2a310586427601d7;hp=bad982f1878b2584741ef0955a65253c022ff19f;hpb=ac265d3d008328b9bdaf00c39ebcd86f263605c7;p=libdcp.git

diff --git a/src/asset.h b/src/asset.h
index bad982f1..2712dcb8 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -47,12 +47,11 @@ class Asset : public Object
 public:
 	Asset ();
 	Asset (boost::filesystem::path file);
-	Asset (std::string id);
 
 	virtual bool equals (
 		boost::shared_ptr<const Asset> other,
 		EqualityOptions opt,
-		boost::function<void (NoteType, std::string)> note
+		NoteHandler note
 		) const;
 
 	/** Write details of the asset to a ASSETMAP.
@@ -78,7 +77,7 @@ public:
 protected:
 	virtual std::string pkl_type (Standard standard) const = 0;
 
-	/** The disk file that represents this asset, if one exists */
+	/** The most recent disk file used to read or write this asset; may be empty */
 	mutable boost::filesystem::path _file;
 	/** Hash of _file, or empty if the hash has not yet been computed */
 	mutable std::string _hash;