Merge branch 'metadata_v0_fix' of http://git.drumgizmo.org/drumgizmo into metadata_v1_fix

2 files changed, 7 insertions, 1 deletions

diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc
index 58bbbcf..64e0bc0 100644
--- a/src/drumkitparser.cc
+++ b/src/drumkitparser.cc
@@ -106,7 +106,7 @@ void DrumKitParser::startTag(std::string name,
       return;
     }
 
-    instr_id = attr["name"];
+    instr_name = attr["name"];
     instr_file = attr["file"];
     if(attr.find("group") != attr.end()) instr_group = attr["group"];
     else instr_group = "";
@@ -344,6 +344,11 @@ int DrumKitParser::readData(char *data, size_t size)
   return fread(data, 1, size, fd);
 }
 
+MetaData DrumKitParser::getMetaData()
+{
+  return meta;
+}
+
 #ifdef TEST_DRUMKITPARSER
 //deps: drumkit.cc saxparser.cc instrument.cc sample.cc audiofile.cc channel.cc
 //cflags: $(EXPAT_CFLAGS) $(SNDFILE_CFLAGS)
diff --git a/src/drumkitparser.h b/src/drumkitparser.h
index 20e1cdb..2393a44 100644
--- a/src/drumkitparser.h
+++ b/src/drumkitparser.h
@@ -49,6 +49,7 @@ private:
 
   FILE *fd;
   DrumKit &kit;
+  MetaData meta;
 
   std::string ch_name;
   std::string ch_title;