Rename Data -> ArrayData.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index 143c62968bd2fe1349ec4e57088df8a413736f4b..e2052d8a13948baca82149568f60267f0cbccc71 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -40,9 +40,9 @@
 
 #include "object.h"
 #include "types.h"
+#include "pkl.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
 #include <boost/optional.hpp>
 
 namespace xmlpp {
@@ -75,13 +75,9 @@ public:
        /** Write details of the asset to a ASSETMAP.
         *  @param node Parent node.
         */
-       void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const;
+       virtual 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, boost::filesystem::path root, Standard standard) const;
+       virtual void add_to_pkl (boost::shared_ptr<PKL> pkl, boost::filesystem::path root) const;
 
        /** @return the most recent disk file used to read or write this asset, if there is one */
        boost::optional<boost::filesystem::path> file () const {
@@ -100,6 +96,8 @@ protected:
        /** The most recent disk file used to read or write this asset */
        mutable boost::optional<boost::filesystem::path> _file;
 
+       static void write_file_to_assetmap (xmlpp::Node* node, boost::filesystem::path root, boost::filesystem::path file, std::string id);
+
 private:
        friend struct ::asset_test;