summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drumgizmo/drumgizmoc.cc2
-rw-r--r--drumgizmo/input/midifile.h2
-rw-r--r--drumgizmo/input/test.cc1
-rw-r--r--drumgizmo/input/test.h1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/audioinputengine.h2
-rw-r--r--src/drumgizmo.cc1
-rw-r--r--src/engineevent.h (renamed from src/event.h)2
-rw-r--r--src/inputfilter.h2
-rw-r--r--src/inputprocessor.h2
-rw-r--r--test/dgreftest/midiinputengine.h8
11 files changed, 10 insertions, 15 deletions
diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc
index 8eba4c9..bca55d2 100644
--- a/drumgizmo/drumgizmoc.cc
+++ b/drumgizmo/drumgizmoc.cc
@@ -46,8 +46,6 @@
#include "enginefactory.h"
#include "bytesizeparser.h"
-#include "event.h"
-
#include "nolocale.h"
struct ParmToken
diff --git a/drumgizmo/input/midifile.h b/drumgizmo/input/midifile.h
index 5756718..a8cf574 100644
--- a/drumgizmo/input/midifile.h
+++ b/drumgizmo/input/midifile.h
@@ -25,9 +25,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
#pragma once
+
#include <string>
-#include <event.h>
#include <smf.h>
#include "audioinputenginemidi.h"
diff --git a/drumgizmo/input/test.cc b/drumgizmo/input/test.cc
index 955d218..bc88c48 100644
--- a/drumgizmo/input/test.cc
+++ b/drumgizmo/input/test.cc
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string>
-#include "event.h"
#include "test.h"
TestInputEngine::TestInputEngine()
diff --git a/drumgizmo/input/test.h b/drumgizmo/input/test.h
index baf7c95..f1e0b42 100644
--- a/drumgizmo/input/test.h
+++ b/drumgizmo/input/test.h
@@ -27,7 +27,6 @@
#pragma once
#include <string>
-#include "event.h"
#include "audioinputengine.h"
class TestInputEngine
diff --git a/src/Makefile.am b/src/Makefile.am
index a5cc5f7..ff02883 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,7 @@ EXTRA_DIST = \
drumgizmoconf.h \
drumkit.h \
drumkitloader.h \
- event.h \
+ engineevent.h \
events.h \
events_ds.h \
grid.h \
diff --git a/src/audioinputengine.h b/src/audioinputengine.h
index 71a86c2..55a06ae 100644
--- a/src/audioinputengine.h
+++ b/src/audioinputengine.h
@@ -29,7 +29,7 @@
#include <string>
#include <vector>
-#include <event.h>
+#include "engineevent.h"
#include "instrument.h"
diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc
index abe57be..9828c6b 100644
--- a/src/drumgizmo.cc
+++ b/src/drumgizmo.cc
@@ -32,7 +32,6 @@
#include <cstring>
#include <mutex>
-#include <event.h>
#include <audiotypes.h>
#include <config.h>
diff --git a/src/event.h b/src/engineevent.h
index 737fb18..9c60a4a 100644
--- a/src/event.h
+++ b/src/engineevent.h
@@ -1,6 +1,6 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/***************************************************************************
- * event.h
+ * engineevent.h
*
* Fri Jun 3 12:10:50 CEST 2011
* Copyright 2011 Bent Bisballe Nyeng
diff --git a/src/inputfilter.h b/src/inputfilter.h
index 45dd01e..128dfb0 100644
--- a/src/inputfilter.h
+++ b/src/inputfilter.h
@@ -26,7 +26,7 @@
*/
#pragma once
-#include <event.h>
+#include "engineevent.h"
//! An abstract filter component for the InputProcessor class filter chain.
class InputFilter
diff --git a/src/inputprocessor.h b/src/inputprocessor.h
index 971cc85..18bb583 100644
--- a/src/inputprocessor.h
+++ b/src/inputprocessor.h
@@ -30,13 +30,13 @@
#include <list>
#include <memory>
-#include <event.h>
#include "drumkit.h"
#include "events.h"
#include "events_ds.h"
#include "id.h"
#include "inputfilter.h"
+#include "engineevent.h"
struct Settings;
class Random;
diff --git a/test/dgreftest/midiinputengine.h b/test/dgreftest/midiinputengine.h
index ffd22f8..e76a182 100644
--- a/test/dgreftest/midiinputengine.h
+++ b/test/dgreftest/midiinputengine.h
@@ -26,15 +26,15 @@
*/
#pragma once
-#include <audioinputenginemidi.h>
-#include <midimapper.h>
-#include <midimapparser.h>
#include <string>
#include <vector>
-#include <event.h>
#include <smf.h>
+#include <audioinputenginemidi.h>
+#include <midimapper.h>
+#include <midimapparser.h>
+
class MidifileInputEngine
: public AudioInputEngineMidi
{