summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/muse/event.cpp2
-rw-r--r--muse/muse/exportmidi.cpp2
-rw-r--r--muse/muse/instruments/minstrument.cpp2
-rw-r--r--muse/muse/midievent.h (renamed from muse/muse/mpevent.h)0
-rw-r--r--muse/muse/midieventbase.cpp (renamed from muse/muse/midievent.cpp)4
-rw-r--r--muse/muse/midifile.cpp2
-rw-r--r--muse/muse/mpevent.cpp2
-rw-r--r--muse/muse/synth.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/muse/muse/event.cpp b/muse/muse/event.cpp
index e7c529cd..77438764 100644
--- a/muse/muse/event.cpp
+++ b/muse/muse/event.cpp
@@ -21,7 +21,7 @@
#include "event.h"
#include "eventbase.h"
#include "waveevent.h"
-#include "midievent.h"
+#include "midieventbase.h"
using AL::Pos;
diff --git a/muse/muse/exportmidi.cpp b/muse/muse/exportmidi.cpp
index 86592a68..94838d4e 100644
--- a/muse/muse/exportmidi.cpp
+++ b/muse/muse/exportmidi.cpp
@@ -25,7 +25,7 @@
#include "globals.h"
#include "widgets/filedialog.h"
#include "song.h"
-#include "mpevent.h"
+#include "midievent.h"
#include "event.h"
#include "midiedit/drummap.h"
#include "gconfig.h"
diff --git a/muse/muse/instruments/minstrument.cpp b/muse/muse/instruments/minstrument.cpp
index ce1bcdd7..b69cd1f3 100644
--- a/muse/muse/instruments/minstrument.cpp
+++ b/muse/muse/instruments/minstrument.cpp
@@ -22,7 +22,7 @@
#include "midioutport.h"
#include "globals.h"
#include "event.h"
-#include "mpevent.h"
+#include "midievent.h"
#include "midictrl.h"
#include "gconfig.h"
#include "midiedit/drummap.h"
diff --git a/muse/muse/mpevent.h b/muse/muse/midievent.h
index 3712a607..3712a607 100644
--- a/muse/muse/mpevent.h
+++ b/muse/muse/midievent.h
diff --git a/muse/muse/midievent.cpp b/muse/muse/midieventbase.cpp
index bdf97af4..0f4b77d3 100644
--- a/muse/muse/midievent.cpp
+++ b/muse/muse/midieventbase.cpp
@@ -19,9 +19,9 @@
//=============================================================================
#include "event.h"
-#include "midievent.h"
+#include "midieventbase.h"
#include "al/xml.h"
-#include "mpevent.h"
+#include "midievent.h"
#include "midictrl.h"
#include "muse.h"
diff --git a/muse/muse/midifile.cpp b/muse/muse/midifile.cpp
index e6eb051b..81c48a3f 100644
--- a/muse/muse/midifile.cpp
+++ b/muse/muse/midifile.cpp
@@ -26,7 +26,7 @@
#include "globals.h"
#include "midictrl.h"
#include "midictrl.h"
-#include "mpevent.h"
+#include "midievent.h"
#include "gconfig.h"
const char* errString[] = {
diff --git a/muse/muse/mpevent.cpp b/muse/muse/mpevent.cpp
index a3f549f4..573302c0 100644
--- a/muse/muse/mpevent.cpp
+++ b/muse/muse/mpevent.cpp
@@ -18,7 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//=============================================================================
-#include "mpevent.h"
+#include "midievent.h"
#include "helper.h"
#include "event.h"
diff --git a/muse/muse/synth.cpp b/muse/muse/synth.cpp
index 5d1a959c..421e0a96 100644
--- a/muse/muse/synth.cpp
+++ b/muse/muse/synth.cpp
@@ -29,7 +29,7 @@
#include "song.h"
#include "audio.h"
#include "event.h"
-#include "mpevent.h"
+#include "midievent.h"
#include "audio.h"
#include "midiseq.h"
#include "midictrl.h"