Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / note-performer.cc

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index a9acca733a513c64a9e3e7453c04d18403416d27..8d9dfb44c17c4005d169d54f0cc77435bf2fc709 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -52,7 +52,22 @@ Note_performer::process_music ()
 
          if (Pitch *pitp = unsmob_pitch (pit))
            {
-             Audio_note *p = new Audio_note (*pitp, get_event_length (n), - transposing);
+              SCM articulations = n->get_property ("articulations");
+              Stream_event *tie_event = 0;
+              for (SCM s = articulations;
+                   !tie_event && scm_is_pair (s);
+                   s = scm_cdr (s))
+                {
+                  Stream_event *ev = unsmob_stream_event (scm_car (s));
+                  if (!ev)
+                    continue;
+         
+                  if (ev->in_event_class ("tie-event"))
+                    tie_event = ev;
+                }
+
+             Audio_note *p = new Audio_note (*pitp, get_event_length (n), 
+                                              tie_event, - transposing);
              Audio_element_info info (p, n);
              announce_element (info);
              notes_.push_back (p);
@@ -67,9 +82,6 @@ Note_performer::stop_translation_timestep ()
 {
   // why don't grace notes show up here?
   // --> grace notes effectively do not get delayed
-  Moment now = now_mom ();
-  for (vsize i = 0; i < notes_.size (); i++)
-    play_element (notes_[i]);
   notes_.clear ();
   note_evs_.clear ();
 }
@@ -82,7 +94,6 @@ Note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Note_performer, "", "",
-               "note-event ",
                "", "");
 
 Note_performer::Note_performer ()