fix #111346: initial implementation of playback of graceNotesAfter

creating function graceNotesMerged this entailed refactoring several data structure to make them visible globally. used function graceNotesMerged to avoid duplicating grace notes if they are played by trill code. added handing of play=false for grace note midi rendering added test cases updated test cases because of recent metronome changes on master
musescore · Aug 10, 2016 · 10ecb8b · 10ecb8b
1 parent f3a711f
commit 10ecb8b
Show file tree

Hide file tree

Showing 7 changed files with 1,675 additions and 145 deletions.
diff --git a/libmscore/rendermidi.cpp b/libmscore/rendermidi.cpp
diff --git a/libmscore/score.h b/libmscore/score.h
@@ -513,7 +513,7 @@ class Score : public QObject, public ScoreElement {
       SynthesizerState _synthesizerState;
 
       void createPlayEvents(Chord*);
-      void createGraceNotesPlayEvents(QVector<Chord*> gnb, int tick, Chord* chord, int& ontime);
+      void createGraceNotesPlayEvents(int tick, Chord* chord, int& ontime, int& trailtime);
 
    signals:
       void posChanged(POS, unsigned);

diff --git a/mtest/libmscore/midi/testBeforeAfterGraceTrill-ref.txt b/mtest/libmscore/midi/testBeforeAfterGraceTrill-ref.txt