Add AssetList to extract some boilerplate from AssetMap and PKL.

1 files changed, 4 insertions, 32 deletions

diff --git a/src/asset_map.h b/src/asset_map.h
index cf91a95b..733dadab 100644
--- a/src/asset_map.h
+++ b/src/asset_map.h
@@ -32,6 +32,7 @@
 */
 
 
+#include "asset_list.h"
 #include "object.h"
 #include "types.h"
 #include <libcxml/cxml.h>
@@ -44,16 +45,12 @@
 namespace dcp {
 
 
-class AssetMap : public Object
+class AssetMap : public Object, public AssetList
 {
 public:
 	AssetMap(Standard standard, boost::optional<std::string> annotation_text, std::string issue_date, std::string issuer, std::string creator)
-		: _standard(standard)
-		, _annotation_text(annotation_text)
-		, _issue_date(issue_date)
-		, _issuer(issuer)
-		, _creator(creator)
-        {}
+		: AssetList(standard, annotation_text, issue_date, issuer, creator)
+	{}
 
 	explicit AssetMap(boost::filesystem::path path);
 
@@ -65,26 +62,6 @@ public:
 
 	std::vector<boost::filesystem::path> pkl_paths() const;
 
-	dcp::Standard standard() const {
-		return _standard;
-	}
-
-	void set_annotation_text(std::string annotation_text) {
-		_annotation_text = annotation_text;
-	}
-
-	void set_issue_date(std::string issue_date) {
-		_issue_date = issue_date;
-	}
-
-	void set_issuer(std::string issuer) {
-		_issuer = issuer;
-	}
-
-	void set_creator(std::string creator) {
-		_creator = creator;
-	}
-
 	void clear_assets();
 	void add_asset(std::string id, boost::filesystem::path path, bool pkl);
 
@@ -117,11 +94,6 @@ public:
 	};
 
 private:
-	dcp::Standard _standard;
-	boost::optional<std::string> _annotation_text;
-        std::string _issue_date;
-        std::string _issuer;
-        std::string _creator;
 	std::vector<Asset> _assets;
 	mutable boost::optional<boost::filesystem::path> _path;
 };