From c2997b9b1a5b831e76b1779aa957f2312a6e5089 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 23 Mar 2016 22:38:44 +0100
Subject: Settings.

---
 src/drumgizmo.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/drumgizmo.h')

diff --git a/src/drumgizmo.h b/src/drumgizmo.h
index 632d5fc..63348da 100644
--- a/src/drumgizmo.h
+++ b/src/drumgizmo.h
@@ -50,6 +50,8 @@
 
 #include "configfile.h"
 
+#include "settings.h"
+
 #define MAX_NUM_CHANNELS 64
 #define REFSFILE "refs.conf"
 #define RESAMPLER_INPUT_BUFFER 64
@@ -58,7 +60,8 @@ class DrumGizmo
 	: public MessageReceiver
 {
 public:
-	DrumGizmo(AudioOutputEngine *outputengine, AudioInputEngine *inputengine);
+	DrumGizmo(Settings& settings,
+	          AudioOutputEngine *outputengine, AudioInputEngine *inputengine);
 	virtual ~DrumGizmo();
 
 	bool loadkit(std::string kitfile);
@@ -106,6 +109,7 @@ protected:
 
 	size_t framesize;
 	bool freewheel;
-	
+
 	std::vector<event_t> events;
+	Settings& settings;
 };
-- 
cgit v1.2.3


From 057ef1d83ba263fb2adf1aa86f8e281ab0065c43 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 8 Apr 2016 00:15:32 +0200
Subject: Refactoring to finally get rid of MessageHandler/Receiver in favor of
 the new Settings mechanism.

---
 src/drumgizmo.h | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/drumgizmo.h')

diff --git a/src/drumgizmo.h b/src/drumgizmo.h
index 63348da..7af5dbb 100644
--- a/src/drumgizmo.h
+++ b/src/drumgizmo.h
@@ -31,25 +31,15 @@
 
 #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
@@ -57,7 +47,6 @@
 #define RESAMPLER_INPUT_BUFFER 64
 
 class DrumGizmo
-	: public MessageReceiver
 {
 public:
 	DrumGizmo(Settings& settings,
@@ -77,8 +66,6 @@ public:
 	std::string configString();
 	bool setConfigString(std::string cfg);
 
-	void handleMessage(Message *msg);
-
 	int samplerate();
 	void setSamplerate(int samplerate);
 
@@ -112,4 +99,5 @@ protected:
 
 	std::vector<event_t> events;
 	Settings& settings;
+	SettingsGetter getter{settings};
 };
-- 
cgit v1.2.3