summaryrefslogtreecommitdiff
path: root/muse2/synti/simpledrums2/simpledrumsgui.cpp
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-11-03 01:03:08 +0000
committerTim E. Real <termtech@rogers.com>2010-11-03 01:03:08 +0000
commit49720ad168e0abef844f10baf6d4f3968eb15318 (patch)
treeae71b0f5c66f46e60b8d6afb1d8b1379cd7f8aa1 /muse2/synti/simpledrums2/simpledrumsgui.cpp
parentba7a03030045602ce55c47a20a63fd72cfe10f47 (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/simpledrumsgui.cpp')
-rw-r--r--muse2/synti/simpledrums2/simpledrumsgui.cpp7
1 files changed, 3 insertions, 4 deletions
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);
}
}