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/simpledrums2 | |
| 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/simpledrums2')
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrums.cpp | 3 | ||||
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrums.h | 3 | ||||
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrumsgui.cpp | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp index 242fd8dd..523b0d98 100644 --- a/muse2/synti/simpledrums2/simpledrums.cpp +++ b/muse2/synti/simpledrums2/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 <qstring.h> #include <samplerate.h> diff --git a/muse2/synti/simpledrums2/simpledrums.h b/muse2/synti/simpledrums2/simpledrums.h index f9463800..7aab4ed3 100644 --- a/muse2/synti/simpledrums2/simpledrums.h +++ b/muse2/synti/simpledrums2/simpledrums.h @@ -15,7 +15,8 @@ #include <sndfile.h> #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/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp index 4b0b1874..79194eed 100644 --- a/muse2/synti/simpledrums2/simpledrumsgui.cpp +++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp @@ -20,7 +20,8 @@ #include <QMessageBox> #include "simpledrumsgui.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" #include "muse/midi.h" #include "ssplugingui.h" @@ -717,9 +718,7 @@ void SimpleSynthGui::loadSampleDialogue(int channel) d[1] = (byte) channel; d[2] = (byte) filename.length(); memcpy(d+3, filename.toLatin1().data(), filename.length()+1); - // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake. - printf("MusE FIXME: SimpleSynthGui::loadSampleDialogue() sendSysex disabled.\n"); -/// sendSysex(d, l); + sendSysex(d, l); } } |