diff options
| -rw-r--r-- | muse2/ChangeLog | 3 | ||||
| -rw-r--r-- | muse2/synti/fluid/fluidgui.cpp | 4 | ||||
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.cpp | 7 | ||||
| -rw-r--r-- | muse2/synti/libsynti/gui.cpp | 3 | ||||
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrumsgui.cpp | 4 |
5 files changed, 16 insertions, 5 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 378faa9f..877d0faa 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,6 @@ +02.11.2010 + - Fluid, fluidsynth, simpledrums: Testing: For now, disable certain sendSysex() calls crashing. (Tim) + Marked as "MusE FIXME:". At least fluidsynth appears to be working now. Other two not so good. 01.11.2010 - Fixed all MESS plugins: compile with -fvisibility=hidden, to avoid namespace conflicts. In particular, simplesynth was causing conflict with variable 'plugins' causing it to diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp index e5677bcb..a94ae9ea 100644 --- a/muse2/synti/fluid/fluidgui.cpp +++ b/muse2/synti/fluid/fluidgui.cpp @@ -65,7 +65,9 @@ void FLUIDGui::loadFont() buffer[k++] = 0x00; // fluid buffer[k++] = 0x01; // load sound font strcpy((char*)(&buffer[k]), path); - sendSysex(buffer, len); + // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake. + printf("MusE FIXME: FLUIDGui::loadFont(): sendSysex disabled.\n"); +/// sendSysex(buffer, len); } //--------------------------------------------------------- diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp index bf12b7f8..f14fc90b 100644 --- a/muse2/synti/fluidsynth/fluidsynti.cpp +++ b/muse2/synti/fluidsynth/fluidsynti.cpp @@ -684,7 +684,9 @@ void FluidSynth::sendChannelData() *(chdptr+1) = i; //Channel nr chdptr += chunk_size; } - sendSysex(chdata_length, chdata); + // 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); // 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 @@ -696,7 +698,8 @@ void FluidSynth::sendChannelData() drumchdataptr++; *drumchdataptr = channels[i].drumchannel; } - sendSysex(drumchdata_length, drumchdata); + // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake. +/// sendSysex(drumchdata_length, drumchdata); } //--------------------------------------------------------- diff --git a/muse2/synti/libsynti/gui.cpp b/muse2/synti/libsynti/gui.cpp index cc737a9e..b5faf54a 100644 --- a/muse2/synti/libsynti/gui.cpp +++ b/muse2/synti/libsynti/gui.cpp @@ -95,7 +95,8 @@ void MessGui::sendSysex(unsigned char* p, int n) // MidiPlayEvent pe(0, 0, ME_SYSEX, p, n); // sendEvent(pe); - sendEvent(MidiPlayEvent(0, 0, ME_SYSEX, p, n)); + printf("MusE TESTING: MessGui::sendSysex(): sendEvent\n"); + sendEvent(MidiPlayEvent(0, 0, ME_SYSEX, p, n)); } //--------------------------------------------------------- diff --git a/muse2/synti/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp index ab511cec..4b0b1874 100644 --- a/muse2/synti/simpledrums2/simpledrumsgui.cpp +++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp @@ -717,7 +717,9 @@ void SimpleSynthGui::loadSampleDialogue(int channel) d[1] = (byte) channel; d[2] = (byte) filename.length(); memcpy(d+3, filename.toLatin1().data(), filename.length()+1); - sendSysex(d, l); + // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake. + printf("MusE FIXME: SimpleSynthGui::loadSampleDialogue() sendSysex disabled.\n"); +/// sendSysex(d, l); } } |