X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset_map.h;h=d2a94f77aae9b2ee69f3a2762f61cc85aa8c1e56;hb=dfc34502469e9c975bf78011b0efc365c11e9779;hp=733dadab2de83b176ebedbe0d2dea66969ba8b75;hpb=c7a9a5c9e368b1a5e657adbebd37d1bbc4984e62;p=libdcp.git

diff --git a/src/asset_map.h b/src/asset_map.h
index 733dadab..d2a94f77 100644
--- a/src/asset_map.h
+++ b/src/asset_map.h
@@ -34,7 +34,6 @@
 
 #include "asset_list.h"
 #include "object.h"
-#include "types.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
@@ -54,8 +53,8 @@ public:
 
 	explicit AssetMap(boost::filesystem::path path);
 
-	boost::optional<boost::filesystem::path> path() const {
-		return _path;
+	boost::optional<boost::filesystem::path> file() const {
+		return _file;
 	}
 
 	std::map<std::string, boost::filesystem::path> asset_ids_and_paths() const;
@@ -93,9 +92,13 @@ public:
 		bool _pkl = false;
 	};
 
+	std::vector<Asset> assets() const {
+		return _assets;
+	}
+
 private:
 	std::vector<Asset> _assets;
-	mutable boost::optional<boost::filesystem::path> _path;
+	mutable boost::optional<boost::filesystem::path> _file;
 };