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. 

18 files changed, 36 insertions, 25 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 877d0faa..832def1d 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,4 +1,11 @@
 02.11.2010
+        - Solved! All the MESS synths load now. Removed mpevent(.h, .cpp) and evdata.h from /libsynti, 
+           conflicting with copies in /muse, causing crashes. Versions in /muse are newer. 
+          Should only be one version. Whether we end up putting it in a library, or leaving it 
+           in the main app as I have done here, it had to be moved one way or another. 
+          If we really need 'reduced, simplified' functionality of the /libsynti mpevent versions,
+           then it should be a base/inherited class type of solution, not two different copies. (Tim)
+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
diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index 124c979c..cde9344b 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -319,7 +319,8 @@ target_link_libraries(muse
       liste mixer driver marker 
       master waveedit mplugins arranger 
       cliplist instruments widgets 
-      synti al      
+      synti       
+      al      
       
       ${QT_LIBRARIES}
       QtSvg
diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp
index a94ae9ea..e5677bcb 100644
--- a/muse2/synti/fluid/fluidgui.cpp
+++ b/muse2/synti/fluid/fluidgui.cpp
@@ -65,9 +65,7 @@ void FLUIDGui::loadFont()
       buffer[k++] = 0x00;       // fluid
       buffer[k++] = 0x01;       // load sound font
       strcpy((char*)(&buffer[k]), path);
-      // FIXME By Tim. This is crashing, after the conversion to QT4 and cmake.            
-      printf("MusE FIXME: FLUIDGui::loadFont(): sendSysex disabled.\n");
-///      sendSysex(buffer, len);
+      sendSysex(buffer, len);
       }
 
 //---------------------------------------------------------
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
diff --git a/muse2/synti/libsynti/CMakeLists.txt b/muse2/synti/libsynti/CMakeLists.txt
index 10154a93..6f72b31c 100644
--- a/muse2/synti/libsynti/CMakeLists.txt
+++ b/muse2/synti/libsynti/CMakeLists.txt
@@ -28,7 +28,8 @@ add_library(synti
       mono.cpp
       poly.cpp
       # midievent.cpp
-      mpevent.cpp
+      # Removed. Causing conflicts with /muse/mpevent
+      ## mpevent.cpp
       )
 
 #
diff --git a/muse2/synti/libsynti/evdata.h b/muse2/synti/libsynti/evdata.h.OLD
index 4e529bec..4e529bec 100644
--- a/muse2/synti/libsynti/evdata.h
+++ b/muse2/synti/libsynti/evdata.h.OLD
diff --git a/muse2/synti/libsynti/gui.cpp b/muse2/synti/libsynti/gui.cpp
index b5faf54a..23a18fee 100644
--- a/muse2/synti/libsynti/gui.cpp
+++ b/muse2/synti/libsynti/gui.cpp
@@ -94,8 +94,7 @@ void MessGui::sendSysex(unsigned char* p, int n)
       {
 //      MidiPlayEvent pe(0, 0, ME_SYSEX, p, n);
 //      sendEvent(pe);
-
-        printf("MusE TESTING: MessGui::sendSysex(): sendEvent\n");
+        
         sendEvent(MidiPlayEvent(0, 0, ME_SYSEX, p, n));
       }
 
diff --git a/muse2/synti/libsynti/mpevent.cpp b/muse2/synti/libsynti/mpevent.cpp.OLD
index 482bc952..482bc952 100644
--- a/muse2/synti/libsynti/mpevent.cpp
+++ b/muse2/synti/libsynti/mpevent.cpp.OLD
diff --git a/muse2/synti/libsynti/mpevent.h b/muse2/synti/libsynti/mpevent.h.OLD
index 8568169f..8568169f 100644
--- a/muse2/synti/libsynti/mpevent.h
+++ b/muse2/synti/libsynti/mpevent.h.OLD
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;
 
diff --git a/muse2/synti/simpledrums/simpledrums.cpp b/muse2/synti/simpledrums/simpledrums.cpp
index 8bca91a4..7c3a4605 100644
--- a/muse2/synti/simpledrums/simpledrums.cpp
+++ b/muse2/synti/simpledrums/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/simpledrums/simpledrums.h b/muse2/synti/simpledrums/simpledrums.h
index 9d0d1331..47a71ca6 100644
--- a/muse2/synti/simpledrums/simpledrums.h
+++ b/muse2/synti/simpledrums/simpledrums.h
@@ -18,7 +18,8 @@
 #include <Qt3Support>
 #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/simpledrums/simpledrumsgui.cpp b/muse2/synti/simpledrums/simpledrumsgui.cpp
index 03fa658c..3ba474af 100644
--- a/muse2/synti/simpledrums/simpledrumsgui.cpp
+++ b/muse2/synti/simpledrums/simpledrumsgui.cpp
@@ -24,7 +24,8 @@
 #include <Q3VBoxLayout>
 
 #include "simpledrumsgui.h"
-#include "libsynti/mpevent.h"
+//#include "libsynti/mpevent.h"
+#include "muse/mpevent.h"   
 #include "muse/midi.h"
 #include "ssplugingui.h"
 
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);
             }
       }