From: David Kastrup <dak@gnu.org>
Date: Wed, 1 Jun 2016 12:43:38 +0000 (+0200)
Subject: Issue 4789: Note_performer: articulate events
X-Git-Tag: release/2.19.43-1^2~6
X-Git-Url: https://git.donarmstrong.com/lilypond.git?p=lilypond.git;a=commitdiff_plain;h=81b0dcffc6b0cc2352b6572a774ef43eb1dad4f0

Issue 4789: Note_performer: articulate events

Previously, only per-note articulations rather than actual stream events
were interpreted in Midi.  This change supports articulations on chords
or added via simultaneous music.
---

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index a2ca6946e9..468210d20d 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -37,13 +37,14 @@ protected:
 
   void listen_note (Stream_event *);
   void listen_breathing (Stream_event *);
+  void listen_tie (Stream_event *);
+  void listen_articulation (Stream_event *);
 private:
-  vector<Stream_event *> note_evs_;
+  vector<Stream_event *> note_evs_, script_evs_;
   vector<Audio_note *> notes_;
 
   vector<Audio_note *> last_notes_;
   Moment last_start_;
-
 };
 
 void
@@ -68,6 +69,10 @@ Note_performer::process_music ()
           Stream_event *tie_event = 0;
           Moment len = get_event_length (n, now_mom ());
           int velocity = 0;
+
+          for (vsize j = script_evs_.size (); j--;)
+            articulations = scm_cons (script_evs_[j]->self_scm (), articulations);
+
           for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
             {
               Stream_event *ev = unsmob<Stream_event> (scm_car (s));
@@ -124,6 +129,7 @@ Note_performer::stop_translation_timestep ()
 
   notes_.clear ();
   note_evs_.clear ();
+  script_evs_.clear ();
 }
 
 void
@@ -132,6 +138,18 @@ Note_performer::listen_note (Stream_event *ev)
   note_evs_.push_back (ev);
 }
 
+void
+Note_performer::listen_tie (Stream_event *ev)
+{
+  script_evs_.push_back (ev);
+}
+
+void
+Note_performer::listen_articulation (Stream_event *ev)
+{
+  script_evs_.push_back (ev);
+}
+
 void
 Note_performer::listen_breathing (Stream_event *ev)
 {
@@ -160,6 +178,8 @@ Note_performer::boot ()
 {
   ADD_LISTENER (Note_performer, note);
   ADD_LISTENER (Note_performer, breathing);
+  ADD_LISTENER (Note_performer, tie);
+  ADD_LISTENER (Note_performer, articulation);
 }
 
 ADD_TRANSLATOR (Note_performer,