From a21ab2d9260bd4cb1af1de0b8cd4cad9e9687861 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 8 Oct 2018 20:50:52 +0200 Subject: Move event.h and audiotypes.h into src and get rid of the obsolete include folder. --- plugin/Makefile.am | 2 -- plugin/Makefile.mingw32.in | 2 +- plugin/drumgizmo_plugin.cc | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'plugin') diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 163fae2..fcb307e 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -14,7 +14,6 @@ drumgizmo_la_CXXFLAGS = -DLV2 -DLV2_PLUGIN_URI=\"http://drumgizmo.org/lv2\" \ -fvisibility=hidden \ $(LV2_CFLAGS) \ $(SNDFILE_CFLAGS) \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/plugin/plugingizmo \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ @@ -48,7 +47,6 @@ endif drumgizmo_vst_la_CXXFLAGS = -DVST \ -fvisibility=hidden \ $(SNDFILE_CFLAGS) \ - -I$(top_srcdir)/include \ -I$(top_srcdir)/plugin/plugingizmo \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 82de017..3619fcb 100644 --- a/plugin/Makefile.mingw32.in +++ b/plugin/Makefile.mingw32.in @@ -39,7 +39,7 @@ DG_SRC = \ @top_srcdir@/src/staminafilter.cc \ @top_srcdir@/src/thread.cc \ @top_srcdir@/src/versionstr.cc -DG_CFLAGS = -I@top_srcdir@ -I@top_srcdir@/include -I@top_srcdir@/src \ +DG_CFLAGS = -I@top_srcdir@ -I@top_srcdir@/src \ -I@top_srcdir@/pugixml/src \ -I@top_srcdir@/plugin/plugingizmo -DVST -DSSE -msse -msse2 # -DDISABLE_HUGIN diff --git a/plugin/drumgizmo_plugin.cc b/plugin/drumgizmo_plugin.cc index af2198c..5614014 100644 --- a/plugin/drumgizmo_plugin.cc +++ b/plugin/drumgizmo_plugin.cc @@ -380,7 +380,7 @@ void DrumGizmoPlugin::Input::run(size_t pos, size_t len, std::vector& e int i = mmap.lookup(event.key); if(event.velocity && (i != -1)) { - events.push_back({TYPE_ONSET, (size_t)i, (size_t)event.getTime(), event.velocity / 127.0f}); + events.push_back({EventType::OnSet, (size_t)i, (size_t)event.getTime(), event.velocity / 127.0f}); } } } -- cgit v1.2.3