1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
|
Description: Log unison collisions (that would otherwise be restruck)
Author: mirabilos <m@mirbsd.org>
Forwarded: not-yet
Justification: depends on experiments/revert-restriking-patch.diff
--- a/synthesizer/event.cpp
+++ b/synthesizer/event.cpp
@@ -14,6 +14,7 @@
#include "libmscore/xml.h"
#include "libmscore/note.h"
#include "libmscore/sig.h"
+#include "libmscore/tie.h"
#include "event.h"
namespace Ms {
@@ -375,6 +376,25 @@ void EventList::insert(const Event& e)
// class EventMap::fixupMIDI
//---------------------------------------------------------
+static void logCollisionNote(const Note* note, unsigned int indent)
+ {
+ QString info = note->accessibleInfoConst() + note->accessibleBarbeat();
+ fprintf(stderr, " %*s%s\n", indent, "- ", qPrintable(info));
+ }
+
+static void logCollisionNotes(const NPlayEvent* event)
+ {
+ for (auto it = event->notes.cbegin(); it != event->notes.cend(); ++it) {
+ const Note* note1 = *it;
+ unsigned int indent = /* initial */ 2;
+ while (note1) {
+ logCollisionNote(note1, indent);
+ indent += /* next level */ 2;
+ note1 = note1->tieFor() ? note1->tieFor()->endNote() : 0;
+ }
+ }
+ }
+
void EventMap::fixupMIDI()
{
/* track info for each of the 128 possible MIDI notes */
@@ -409,6 +429,12 @@ void EventMap::fixupMIDI()
else if (++np > 1) {
/* already playing */
discard = true;
+ /* log the collision */
+ fprintf(stderr, "MIDI collision detected: newly played...\n");
+ logCollisionNotes(&(it->second));
+ fprintf(stderr, " ... interferes with already playing...\n");
+ logCollisionNotes(info[it->second.channel()].event[it->second.pitch()]);
+ fprintf(stderr, " ... which will continue to sound.\n");
/* carry over the corresponding score notes */
info[it->second.channel()].event[it->second.pitch()]->notes.insert(info[it->second.channel()].event[it->second.pitch()]->notes.end(), it->second.notes.begin(), it->second.notes.end());
}
|