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/libsynti | |
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/libsynti')
-rw-r--r-- | muse2/synti/libsynti/CMakeLists.txt | 3 | ||||
-rw-r--r-- | muse2/synti/libsynti/evdata.h.OLD (renamed from muse2/synti/libsynti/evdata.h) | 0 | ||||
-rw-r--r-- | muse2/synti/libsynti/gui.cpp | 3 | ||||
-rw-r--r-- | muse2/synti/libsynti/mpevent.cpp.OLD (renamed from muse2/synti/libsynti/mpevent.cpp) | 0 | ||||
-rw-r--r-- | muse2/synti/libsynti/mpevent.h.OLD (renamed from muse2/synti/libsynti/mpevent.h) | 0 |
5 files changed, 3 insertions, 3 deletions
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 |