Support file:// URI-style file specifiers in asset map.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index e6a302c15010be3fccfd977cfb13fa6caba5927f..bad982f1878b2584741ef0955a65253c022ff19f 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -28,6 +28,7 @@
 #include "types.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
+#include <boost/bind.hpp>
 
 namespace xmlpp {
        class Node;
@@ -61,8 +62,9 @@ public:
 
        /** Write details of the asset to a PKL AssetList node.
         *  @param node Parent node.
+        *  @param standard Standard to use.
         */
-       void write_to_pkl (xmlpp::Node* node) const;
+       void write_to_pkl (xmlpp::Node* node, Standard standard) const;
 
        boost::filesystem::path file () const {
                return _file;
@@ -70,14 +72,12 @@ public:
 
        void set_file (boost::filesystem::path file) const;
 
-       /** @return the hash of this asset's file.  It will be
-        *  computed by this call if necessary.
-        */
-       std::string hash () const;
+       /** @return the hash of this asset's file */
+       std::string hash (boost::function<void (float)> progress = 0) const;
 
 protected:
-       virtual std::string pkl_type () const = 0;
-       
+       virtual std::string pkl_type (Standard standard) const = 0;
+
        /** The disk file that represents this asset, if one exists */
        mutable boost::filesystem::path _file;
        /** Hash of _file, or empty if the hash has not yet been computed */