From b89d5e1c9932052f07bcbedb86ae58a43e065627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= <cgloeckner@freenet.de>
Date: Fri, 27 May 2016 09:47:06 +0200
Subject: fixes after rebase

---
 src/audioinputenginemidi.h | 2 +-
 src/powerlist.h            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/audioinputenginemidi.h b/src/audioinputenginemidi.h
index ffa8018..07358f1 100644
--- a/src/audioinputenginemidi.h
+++ b/src/audioinputenginemidi.h
@@ -61,9 +61,9 @@ public:
 protected:
 	MidiMapper mmap;
 	
-private:
 	MidiProcessor midi_processor;
 
+private:
 	std::string midimap;
 	bool is_valid;
 
diff --git a/src/powerlist.h b/src/powerlist.h
index f194fb0..5a362c6 100644
--- a/src/powerlist.h
+++ b/src/powerlist.h
@@ -48,6 +48,7 @@ private:
 		float power;
 	};
 
+
 	Random& rand;
 	
 	std::vector<PowerListItem> samples;
-- 
cgit v1.2.3