From bb1a0848c263f15f404649067b7b2d8e09b7e727 Mon Sep 17 00:00:00 2001 From: Lars Bisballe Jensen Date: Sat, 14 Mar 2015 15:20:34 +0100 Subject: Fixed minor stuff --- src/drumkitparser.cc | 7 ++++++- src/drumkitparser.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3