diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-11-03 01:03:08 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-11-03 01:03:08 +0000 |
| commit | 49720ad168e0abef844f10baf6d4f3968eb15318 (patch) | |
| tree | ae71b0f5c66f46e60b8d6afb1d8b1379cd7f8aa1 /muse2/synti/organ | |
| parent | ba7a03030045602ce55c47a20a63fd72cfe10f47 (diff) | |
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.
Diffstat (limited to 'muse2/synti/organ')
| -rw-r--r-- | muse2/synti/organ/organ.cpp | 3 | ||||
| -rw-r--r-- | muse2/synti/organ/organgui.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/muse2/synti/organ/organ.cpp b/muse2/synti/organ/organ.cpp index 2dede8de..0ab7880d 100644 --- a/muse2/synti/organ/organ.cpp +++ b/muse2/synti/organ/organ.cpp @@ -14,7 +14,8 @@ #include <stdio.h> #include "muse/midi.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" #include "organ.h" #include "organgui.h" diff --git a/muse2/synti/organ/organgui.h b/muse2/synti/organ/organgui.h index 9f133de7..d612eece 100644 --- a/muse2/synti/organ/organgui.h +++ b/muse2/synti/organ/organgui.h @@ -12,7 +12,8 @@ #include "organguibase.h" #include "organ.h" #include "libsynti/gui.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" class QSignalMapper; |