Merge branch 'settings'

1 files changed, 6 insertions, 14 deletions

diff --git a/src/drumgizmo.h b/src/drumgizmo.h
index 632d5fc..7af5dbb 100644
--- a/src/drumgizmo.h
+++ b/src/drumgizmo.h
@@ -31,34 +31,26 @@
 
 #include "audiooutputengine.h"
 #include "audioinputengine.h"
-
 #include "events.h"
 #include "audiofile.h"
 #include "drumkit.h"
 #include "memchecker.h"
-
 #include "drumkitloader.h"
 #include "audiocache.h"
-
 #include "mutex.h"
-
-#include "message.h"
-
-#include "messagereceiver.h"
-
 #include "chresampler.h"
-
 #include "configfile.h"
+#include "settings.h"
 
 #define MAX_NUM_CHANNELS 64
 #define REFSFILE "refs.conf"
 #define RESAMPLER_INPUT_BUFFER 64
 
 class DrumGizmo
-	: public MessageReceiver
 {
 public:
-	DrumGizmo(AudioOutputEngine *outputengine, AudioInputEngine *inputengine);
+	DrumGizmo(Settings& settings,
+	          AudioOutputEngine *outputengine, AudioInputEngine *inputengine);
 	virtual ~DrumGizmo();
 
 	bool loadkit(std::string kitfile);
@@ -74,8 +66,6 @@ public:
 	std::string configString();
 	bool setConfigString(std::string cfg);
 
-	void handleMessage(Message *msg);
-
 	int samplerate();
 	void setSamplerate(int samplerate);
 
@@ -106,6 +96,8 @@ protected:
 
 	size_t framesize;
 	bool freewheel;
-	
+
 	std::vector<event_t> events;
+	Settings& settings;
+	SettingsGetter getter{settings};
 };