Fix build errors due to rebase.

3 files changed, 3 insertions, 3 deletions

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 {
 				/*
diff --git a/src/velocity.cc b/src/velocity.cc
index e08ab9b..c8faa32 100644
--- a/src/velocity.cc
+++ b/src/velocity.cc
@@ -47,7 +47,7 @@ void Velocity::addSample(Sample* sample, float probability)
 	}
 }
 
-Sample* Velocity::getSample() const
+Sample* Velocity::getSample()
 {
 	Sample* sample{nullptr};
 
diff --git a/src/velocity.h b/src/velocity.h
index 41622d3..19284a4 100644
--- a/src/velocity.h
+++ b/src/velocity.h
@@ -37,7 +37,7 @@ public:
 	Velocity(unsigned int lower, unsigned int upper);
 
 	void addSample(Sample* sample, float probability);
-	Sample* getSample() const;
+	Sample* getSample();
 
 	unsigned int lower;
 	unsigned int upper;