Get Signer to take a PEM string rather than a filename.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index f9ec949f662c4b48d5e5d5fe0e05c921e71290b0..86d5daf56316f32c70bc5a2689af00595202bbbf 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;
@@ -48,7 +49,6 @@ public:
        Asset (boost::filesystem::path file);
        Asset (std::string id);
 
-       virtual std::string pkl_type () const = 0;
        virtual bool equals (
                boost::shared_ptr<const Asset> other,
                EqualityOptions opt,
@@ -58,29 +58,27 @@ public:
        /** Write details of the asset to a ASSETMAP.
         *  @param node Parent node.
         */
-       void write_to_assetmap (xmlpp::Node* node) const;
+       void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const;
 
        /** 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;
        }
 
-       void set_file (boost::filesystem::path file) const {
-               _file = file;
-               _hash.clear ();
-       }
+       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:
-       /** The disk file that represents this asset, if one exists */
+       virtual std::string pkl_type (Standard standard) const = 0;
+
+       /** 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;