Fix up some problems with being included.

[libdcp.git] / src / asset_map.h

diff --git a/src/asset_map.h b/src/asset_map.h
index 56370ab9ac8d8d221bf6cb24a5ad7080f330a7b9..3f51ca12b8bc07bc2ad1eccce56a69fa1521b546 100644 (file)
--- a/src/asset_map.h
+++ b/src/asset_map.h
@@ -1,26 +1,30 @@
+#include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include "xml.h"
 
 namespace libdcp {
 
-class AssetMapAsset : public XMLNode
+class Chunk : public XMLNode
 {
 public:
-       AssetMapAsset ();
-       AssetMapAsset (xmlpp::Node const * node);
+       Chunk ();
+       Chunk (xmlpp::Node const * node);
 
-       std::string id;
-       std::string packing_list;
-       boost::shared_ptr<ChunkList> 
+       std::string path;
+       int64_t volume_index;
+       int64_t offset;
+       int64_t length;
 };
 
-class AssetMapAssetList : public XMLNode
+class AssetMapAsset : public XMLNode
 {
 public:
-       AssetMapAssetList ();
-       AssetMapAssetList (xmlpp::Node const * node);
+       AssetMapAsset ();
+       AssetMapAsset (xmlpp::Node const * node);
 
-       std::list<boost::shared_ptr<AssetMapAsset> > assets;
+       std::string id;
+       std::string packing_list;
+       std::list<boost::shared_ptr<Chunk> > chunks;
 };
 
 class AssetMap : public XMLFile
@@ -30,8 +34,10 @@ public:
 
        std::string id;
        std::string creator;
-       int volume_count;
+       int64_t volume_count;
        std::string issue_date;
        std::string issuer;
-       boost::shared_ptr<AssetMapAssetList> asset_list;
+       std::list<boost::shared_ptr<AssetMapAsset> > assets;
 };
+
+}