From dff95433d3d9d677f93c2f3be8c887a0e3c6f6df Mon Sep 17 00:00:00 2001
From: Lars Bisballe Jensen <larsbisballe@gmail.com>
Date: Tue, 21 Oct 2014 14:45:06 +0200
Subject: Added struct that contains all metadata

---
 src/drumkitparser.h | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'src/drumkitparser.h')

diff --git a/src/drumkitparser.h b/src/drumkitparser.h
index 7b34b44..6b24fa5 100644
--- a/src/drumkitparser.h
+++ b/src/drumkitparser.h
@@ -30,6 +30,18 @@
 #include "saxparser.h"
 #include "drumkit.h"
 
+struct MetaData {
+  std::string version;
+  std::string name;
+  std::string description;
+  std::string notes;
+  std::string author;
+  std::string email;
+  std::string website;
+  std::vector<std::pair< std::string, std::string> > channels; // name, microphone
+  std::vector<std::pair< std::string, std::string> > instruments; // name, microphone
+};
+
 class DrumKitParser : public SAXParser {
 public:
   DrumKitParser(const std::string &kitfile, DrumKit &kit);
@@ -39,6 +51,7 @@ public:
                 std::map< std::string, std::string> attributes,
                 std::string &data);
   void endTag(std::string name);
+  MetaData getMetaData();
 
 protected:
   int readData(char *data, size_t size);
@@ -46,12 +59,21 @@ protected:
 private:
   FILE *fd;
   DrumKit &kit;
+
+  MetaData meta;
+
+  std::string ch_id;
+  std::string ch_name;
+  std::string ch_microphone;
+  
   //  Instrument *instr;
   std::string path;
 
   std::map<std::string, std::string> channelmap;
-  std::string instr_file;
   std::string instr_name;
+  std::string instr_description;
+  std::string instr_file;
+  std::string instr_id;
   std::string instr_group;
   bool in_metadata;
   bool in_channel;
-- 
cgit v1.2.3