Add metadata support to xml parser and dom model. RE-add unit-tests for version 1 instruments.

1 files changed, 24 insertions, 2 deletions

diff --git a/src/DGDOM.h b/src/DGDOM.h
index 933c250..dea4228 100644
--- a/src/DGDOM.h
+++ b/src/DGDOM.h
@@ -103,13 +103,35 @@ struct InstrumentRefDOM
 	std::vector<ChannelMapDOM> channel_map;
 };
 
-struct DrumkitDOM
+struct ClickMapDOM
+{
+	std::string instrument;
+	std::string colour;
+};
+
+struct MetadataDOM
 {
-	std::string name;
 	std::string version;
+	std::string title;
 	std::string description;
+	std::string license;
+	std::string notes;
+	std::string author;
+	std::string email;
+	std::string website;
+	std::string logo;
+	std::string image;
+	std::string image_map;
+	std::vector<ClickMapDOM> clickmaps;
+};
+
+struct DrumkitDOM
+{
+	std::string version;
 	double samplerate;
 
+	MetadataDOM metadata;
+
 	std::vector<InstrumentRefDOM> instruments;
 	std::vector<ChannelDOM> channels;
 };