From c7aae008ad818f9cb453ce184673e0edf8ba4e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Nusser?= <andre.nusser@googlemail.com>
Date: Thu, 31 Mar 2016 18:00:18 +0200
Subject: Fix build errors due to rebase.

---
 src/drumkitparser.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/drumkitparser.cc')

diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc
index 595cd41..3ba69c8 100644
--- a/src/drumkitparser.cc
+++ b/src/drumkitparser.cc
@@ -209,7 +209,7 @@ void DrumKitParser::endTag(const std::string& name)
 			if(c->num == NO_CHANNEL)
 			{
 				ERR(kitparser, "Missing channel '%s' in instrument '%s'\n",
-				      c->name.c_str(), i->name().c_str());
+				      c->name.c_str(), i->getName().c_str());
 			}
 			else {
 				/*
-- 
cgit v1.2.3