From 262ca794c3204e6686e4980c53b0dac0d2218030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Nusser?= <andre.nusser@googlemail.com>
Date: Thu, 25 May 2017 20:01:04 +0200
Subject: Introduce settings for master bleed control.

---
 src/settings.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/settings.h b/src/settings.h
index 6d094ea..b23f919 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -86,6 +86,8 @@ struct Settings
 	Atomic<std::size_t> number_of_files{0};
 	Atomic<std::size_t> number_of_files_loaded{0};
 	Atomic<std::string> current_file{""};
+
+	Atomic<float> master_bleed{1.0f};
 };
 
 //! Settings getter class.
@@ -124,6 +126,8 @@ struct SettingsGetter
 	SettingRef<std::size_t> number_of_files_loaded;
 	SettingRef<std::string> current_file;
 
+	SettingRef<float> master_bleed;
+
 	SettingsGetter(Settings& settings)
 		: drumkit_file(settings.drumkit_file)
 		, drumkit_load_status(settings.drumkit_load_status)
@@ -150,6 +154,7 @@ struct SettingsGetter
 		, number_of_files{settings.number_of_files}
 		, number_of_files_loaded{settings.number_of_files_loaded}
 		, current_file{settings.current_file}
+		, master_bleed{settings.master_bleed}
 	{
 	}
 };
@@ -191,6 +196,8 @@ public:
 	Notifier<std::size_t> number_of_files_loaded;
 	Notifier<std::string> current_file;
 
+	Notifier<float> master_bleed;
+
 	void evaluate()
 	{
 #define EVAL(x) if(settings.x.hasChanged()) { x(settings.x.getValue()); }
@@ -227,6 +234,8 @@ public:
 		EVAL(number_of_files);
 		EVAL(number_of_files_loaded);
 		EVAL(current_file);
+
+		EVAL(master_bleed);
 	}
 
 	SettingsNotifier(Settings& settings)
-- 
cgit v1.2.3