From 49720ad168e0abef844f10baf6d4f3968eb15318 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Wed, 3 Nov 2010 01:03:08 +0000 Subject: Removed mpevent(.h, .cpp) and evdata.h from /libsynti, conflicting with copies in /muse, causing crashes. Version in /muse is newer. Should only be one version. --- muse2/synti/simpledrums/simpledrums.cpp | 3 ++- muse2/synti/simpledrums/simpledrums.h | 3 ++- muse2/synti/simpledrums/simpledrumsgui.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'muse2/synti/simpledrums') diff --git a/muse2/synti/simpledrums/simpledrums.cpp b/muse2/synti/simpledrums/simpledrums.cpp index 8bca91a4..7c3a4605 100644 --- a/muse2/synti/simpledrums/simpledrums.cpp +++ b/muse2/synti/simpledrums/simpledrums.cpp @@ -12,7 +12,8 @@ #include "muse/midictrl.h" #include "muse/midi.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" #include "simpledrums.h" #include #include diff --git a/muse2/synti/simpledrums/simpledrums.h b/muse2/synti/simpledrums/simpledrums.h index 9d0d1331..47a71ca6 100644 --- a/muse2/synti/simpledrums/simpledrums.h +++ b/muse2/synti/simpledrums/simpledrums.h @@ -18,7 +18,8 @@ #include #include "libsynti/mess.h" #include "common.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" #include "simpledrumsgui.h" #include "ssplugin.h" diff --git a/muse2/synti/simpledrums/simpledrumsgui.cpp b/muse2/synti/simpledrums/simpledrumsgui.cpp index 03fa658c..3ba474af 100644 --- a/muse2/synti/simpledrums/simpledrumsgui.cpp +++ b/muse2/synti/simpledrums/simpledrumsgui.cpp @@ -24,7 +24,8 @@ #include #include "simpledrumsgui.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" #include "muse/midi.h" #include "ssplugingui.h" -- cgit v1.2.3