summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Bisballe Jensen <larsbisballe@gmail.com>2014-10-22 15:59:21 +0200
committerLars Bisballe Jensen <larsbisballe@gmail.com>2014-10-22 15:59:21 +0200
commitbe826130ca0919242ce55030152e290d8076855d (patch)
tree89ce9118e00a21649eef31eb9b15b5f6482f928f
parente5332d6814e8f5ccb1e0d96b9a3e909e210a670d (diff)
Changed name to id for channels
-rw-r--r--src/drumkitparser.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc
index f04f710..b2acf1b 100644
--- a/src/drumkitparser.cc
+++ b/src/drumkitparser.cc
@@ -291,15 +291,15 @@ void DrumKitParser::endTag(std::string name)
while(ic != parser.channellist.end()) {
InstrumentChannel *c = *ic;
- std::string cname = c->name;
+ std::string cname = c->id;
if(channelmap.find(cname) != channelmap.end()) cname = channelmap[cname];
for(size_t cnt = 0; cnt < kit.channels.size(); cnt++) {
- if(kit.channels[cnt].name == cname) c->num = kit.channels[cnt].num;
+ if(kit.channels[cnt].id == cname) c->num = kit.channels[cnt].num;
}
if(c->num == NO_CHANNEL) {
DEBUG(kitparser, "Missing channel '%s' in instrument '%s'\n",
- c->name.c_str(), i->id().c_str());
+ c->id.c_str(), i->id().c_str());
} else {
/*
DEBUG(kitparser, "Assigned channel '%s' to number %d in instrument '%s'\n",