Merge.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index eab24d28339e5b4ac15361679fe30e49dad7753a..cc6fbcb7c374f7ec06ed98afd004fc2b3e875d1b 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -25,8 +25,8 @@
 #define LIBDCP_ASSET_H
 
 #include <string>
+#include <list>
 #include <boost/filesystem.hpp>
-#include <sigc++/sigc++.h>
 #include "types.h"
 
 namespace ASDCP {
@@ -45,9 +45,11 @@ class Asset
 public:
        /** Construct an Asset.
         *  @param directory Directory where our XML or MXF file is.
-        *  @param file_name Name of our file within directory.
+        *  @param file_name Name of our file within directory, or empty to make one up based on UUID.
         */
-       Asset (std::string directory, std::string file_name);
+       Asset (std::string directory, std::string file_name = "");
+
+       virtual ~Asset() {}
 
        /** Write details of the asset to a CPL stream.
         *  @param s Stream.
@@ -68,7 +70,7 @@ public:
                return _uuid;
        }
 
-       virtual std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const = 0;
+       virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const = 0;
 
 protected:
        friend class PictureAsset;