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/fluidsynth | |
| 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/fluidsynth')
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.cpp | 10 | ||||
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.h | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp index f14fc90b..d130e741 100644 --- a/muse2/synti/fluidsynth/fluidsynti.cpp +++ b/muse2/synti/fluidsynth/fluidsynti.cpp @@ -14,7 +14,6 @@ #include <iostream> #include <qfileinfo.h> - FluidCtrl FluidSynth::fluidCtrl[] = { //{ "Expression", CTRL_EXPRESSION, 0, 127 }, //{ "Sustain", CTRL_SUSTAIN, 0, 127 }, @@ -164,7 +163,7 @@ void FluidSynth::processMessages() else { if (FS_DEBUG) - printf("FluidSynth::process(): unknown event, type: %d\n", ev.type()); + printf("FluidSynth::processMessages(): unknown event, type: %d\n", ev.type()); } } @@ -684,9 +683,7 @@ void FluidSynth::sendChannelData() *(chdptr+1) = i; //Channel nr chdptr += chunk_size; } - // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake. - printf("MusE FIXME: FluidSynth::sendChannelData() sendSysex disabled.\n"); -/// sendSysex(chdata_length, chdata); + sendSysex(chdata_length, chdata); // Send drum channel info afterwards (later addition, not very neat, but works...) int drumchdata_length = FS_MAX_NR_OF_CHANNELS + 1; //1 byte for the command, one byte for each channel @@ -699,7 +696,8 @@ void FluidSynth::sendChannelData() *drumchdataptr = channels[i].drumchannel; } // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake. -/// sendSysex(drumchdata_length, drumchdata); + //usleep(1000); + sendSysex(drumchdata_length, drumchdata); } //--------------------------------------------------------- diff --git a/muse2/synti/fluidsynth/fluidsynti.h b/muse2/synti/fluidsynth/fluidsynti.h index 10b96b9d..c187798d 100644 --- a/muse2/synti/fluidsynth/fluidsynti.h +++ b/muse2/synti/fluidsynth/fluidsynti.h @@ -17,7 +17,8 @@ #include "fluidsynthgui.h" #include "libsynti/mess.h" #include "muse/debug.h" -#include "libsynti/mpevent.h" +//#include "libsynti/mpevent.h" +#include "muse/mpevent.h" #include "muse/midictrl.h" #define FS_DEBUG_DATA 0 //Turn on/off debug print of midi data sent to fluidsynth |