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.

---
 plugingui/plugingui.h | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'plugingui/plugingui.h')

diff --git a/plugingui/plugingui.h b/plugingui/plugingui.h
index f441696..ca31c41 100644
--- a/plugingui/plugingui.h
+++ b/plugingui/plugingui.h
@@ -31,9 +31,7 @@
 
 #include "pluginconfig.h"
 
-
-#include "thread.h"
-#include "semaphore.h"
+#include <settings.h>
 
 #include "messagereceiver.h"
 #include "notifier.h"
@@ -68,6 +66,21 @@ public:
 
 	Notifier<> closeNotifier;
 
+	// Setting notifiers:
+	Notifier<bool> enable_velocity_modifier_notifier;
+	Notifier<float> velocity_modifier_falloff_notifier;
+	Notifier<float> velocity_modifier_weight_notifier;
+
+	Notifier<bool> enable_velocity_randomiser_notifier;
+	Notifier<float> velocity_randomiser_weight_notifier;
+
+	Notifier<double> samplerate_notifier;
+
+	Notifier<bool> enable_resampling_notifier;
+
+	Notifier<float> drumkit_file_progress_notifier;
+	//Notifier<std::string> current_file_notifier;
+
 	// Support old interface a little while longer..
 	void setWindowClosedCallback(void (*handler)(void*), void* ptr);
 
@@ -80,11 +93,12 @@ private:
 	volatile bool closing{false};
 	volatile bool initialised{false};
 
-	Semaphore sem{"plugingui"};
-
 	// For the old-style notifier.
 	void (*windowClosedHandler)(void *){nullptr};
 	void *windowClosedPtr{nullptr};
+
+	Settings settings;
+	SettingsGetter getter{settings};
 };
 
 } // GUI::
-- 
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.

---
 plugingui/plugingui.h | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'plugingui/plugingui.h')

diff --git a/plugingui/plugingui.h b/plugingui/plugingui.h
index ca31c41..04b0a29 100644
--- a/plugingui/plugingui.h
+++ b/plugingui/plugingui.h
@@ -26,24 +26,20 @@
  */
 #pragma once
 
+#include <settings.h>
+#include <notifier.h>
+
 #include "dgwindow.h"
 #include "eventhandler.h"
-
 #include "pluginconfig.h"
 
-#include <settings.h>
-
-#include "messagereceiver.h"
-#include "notifier.h"
-
 namespace GUI {
 
 class PluginGUI
-	: public MessageReceiver
-	, public Listener
+	: public Listener
 {
 public:
-	PluginGUI(void* native_window = nullptr);
+	PluginGUI(Settings& settings, void* native_window = nullptr);
 	virtual ~PluginGUI();
 
 	//! Process all events and messages in queue
@@ -56,9 +52,6 @@ public:
 	void show();
 	void hide();
 
-
-	void handleMessage(Message* msg);
-
 	DGWindow* window{nullptr};
 	EventHandler* eventhandler{nullptr};
 
@@ -66,21 +59,6 @@ public:
 
 	Notifier<> closeNotifier;
 
-	// Setting notifiers:
-	Notifier<bool> enable_velocity_modifier_notifier;
-	Notifier<float> velocity_modifier_falloff_notifier;
-	Notifier<float> velocity_modifier_weight_notifier;
-
-	Notifier<bool> enable_velocity_randomiser_notifier;
-	Notifier<float> velocity_randomiser_weight_notifier;
-
-	Notifier<double> samplerate_notifier;
-
-	Notifier<bool> enable_resampling_notifier;
-
-	Notifier<float> drumkit_file_progress_notifier;
-	//Notifier<std::string> current_file_notifier;
-
 	// Support old interface a little while longer..
 	void setWindowClosedCallback(void (*handler)(void*), void* ptr);
 
@@ -97,8 +75,8 @@ private:
 	void (*windowClosedHandler)(void *){nullptr};
 	void *windowClosedPtr{nullptr};
 
-	Settings settings;
-	SettingsGetter getter{settings};
+	Settings& settings;
+	SettingsNotifier settings_notifier{settings};
 };
 
 } // GUI::
-- 
cgit v1.2.3