From c2997b9b1a5b831e76b1779aa957f2312a6e5089 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 23 Mar 2016 22:38:44 +0100 Subject: Settings. --- plugin/drumgizmo_plugin.cc | 2 +- plugin/drumgizmo_plugin.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'plugin') diff --git a/plugin/drumgizmo_plugin.cc b/plugin/drumgizmo_plugin.cc index b8f8822..24cfb9a 100644 --- a/plugin/drumgizmo_plugin.cc +++ b/plugin/drumgizmo_plugin.cc @@ -59,7 +59,7 @@ DrumGizmoPlugin::DrumGizmoPlugin() { init(); - drumgizmo = std::make_shared(&output, &input); + drumgizmo = std::make_shared(settings, &output, &input); resizeWindow(370, 330); drumgizmo->setFreeWheel(true); drumgizmo->setSamplerate(44100); diff --git a/plugin/drumgizmo_plugin.h b/plugin/drumgizmo_plugin.h index 28a1b8f..3508c3e 100644 --- a/plugin/drumgizmo_plugin.h +++ b/plugin/drumgizmo_plugin.h @@ -154,6 +154,8 @@ private: Output output{*this}; const std::vector* output_samples{nullptr}; + Settings settings; + std::shared_ptr plugin_gui; std::shared_ptr drumgizmo; }; -- cgit v1.2.3 From 19691923340e5984e3ace837d39938f718fee608 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 31 Mar 2016 22:11:07 +0200 Subject: Removed the last Conf:: namespace usage and replaced it with Settings. --- plugin/Makefile.mingw32.in | 1 - 1 file changed, 1 deletion(-) (limited to 'plugin') diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 40233b4..779f54b 100644 --- a/plugin/Makefile.mingw32.in +++ b/plugin/Makefile.mingw32.in @@ -19,7 +19,6 @@ DG_SRC = \ @top_srcdir@/src/channelmixer.cc \ @top_srcdir@/src/chresampler.cc \ @top_srcdir@/src/configfile.cc \ - @top_srcdir@/src/configuration.cc \ @top_srcdir@/src/configparser.cc \ @top_srcdir@/src/drumgizmo.cc \ @top_srcdir@/src/drumkit.cc \ -- cgit v1.2.3 From 057ef1d83ba263fb2adf1aa86f8e281ab0065c43 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng 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. --- plugin/Makefile.mingw32.in | 2 -- plugin/drumgizmo_plugin.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'plugin') diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 779f54b..8b341c7 100644 --- a/plugin/Makefile.mingw32.in +++ b/plugin/Makefile.mingw32.in @@ -28,8 +28,6 @@ DG_SRC = \ @top_srcdir@/src/instrument.cc \ @top_srcdir@/src/instrumentparser.cc \ @top_srcdir@/src/memchecker.cc \ - @top_srcdir@/src/messagehandler.cc \ - @top_srcdir@/src/messagereceiver.cc \ @top_srcdir@/src/midimapparser.cc \ @top_srcdir@/src/midimapper.cc \ @top_srcdir@/src/mutex.cc \ diff --git a/plugin/drumgizmo_plugin.cc b/plugin/drumgizmo_plugin.cc index 24cfb9a..06c2799 100644 --- a/plugin/drumgizmo_plugin.cc +++ b/plugin/drumgizmo_plugin.cc @@ -143,7 +143,7 @@ bool DrumGizmoPlugin::hasGUI() void DrumGizmoPlugin::createWindow(void *parent) { - plugin_gui = std::make_shared(parent); + plugin_gui = std::make_shared(settings, parent); resizeWindow(370, 330); onShowWindow(); } -- cgit v1.2.3