diff options
Diffstat (limited to 'plugin')
-rw-r--r-- | plugin/Makefile.mingw32.in | 3 | ||||
-rw-r--r-- | plugin/drumgizmo_plugin.cc | 4 | ||||
-rw-r--r-- | plugin/drumgizmo_plugin.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 40233b4..8b341c7 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 \ @@ -29,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 b8f8822..06c2799 100644 --- a/plugin/drumgizmo_plugin.cc +++ b/plugin/drumgizmo_plugin.cc @@ -59,7 +59,7 @@ DrumGizmoPlugin::DrumGizmoPlugin() { init(); - drumgizmo = std::make_shared<DrumGizmo>(&output, &input); + drumgizmo = std::make_shared<DrumGizmo>(settings, &output, &input); resizeWindow(370, 330); drumgizmo->setFreeWheel(true); drumgizmo->setSamplerate(44100); @@ -143,7 +143,7 @@ bool DrumGizmoPlugin::hasGUI() void DrumGizmoPlugin::createWindow(void *parent) { - plugin_gui = std::make_shared<GUI::PluginGUI>(parent); + plugin_gui = std::make_shared<GUI::PluginGUI>(settings, parent); resizeWindow(370, 330); onShowWindow(); } 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<float*>* output_samples{nullptr}; + Settings settings; + std::shared_ptr<GUI::PluginGUI> plugin_gui; std::shared_ptr<DrumGizmo> drumgizmo; }; |