Run `make grand-replace'.

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index e5c2ef9e050d83b60b5338d21dbfb5f5aab2addf..7b664fd91ebb0dffef62bd9d1d42b2f8c0878fb4 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
@@ -15,9 +15,6 @@
 
 #include "translator.icc"
 
-/**
-   Convert evs to audio notes.
-*/
 class Note_performer : public Performer
 {
 public:
@@ -31,57 +28,78 @@ protected:
 private:
   vector<Stream_event*> note_evs_;
   vector<Audio_note*> notes_;
+
+
+  vector<Audio_note*> last_notes_;
+  Moment last_start_;
+  
 };
 
 void
 Note_performer::process_music ()
 {
-  if (note_evs_.size ())
-    {
-      int transposing = 0;
+  if (!note_evs_.size ())
+    return;
 
-      SCM prop = get_property ("instrumentTransposition");
-      if (unsmob_pitch (prop))
-       transposing = unsmob_pitch (prop)->rounded_semitone_pitch ();
+  Pitch transposing;
+  SCM prop = get_property ("instrumentTransposition");
+  if (unsmob_pitch (prop))
+    transposing = *unsmob_pitch (prop);
 
-      while (note_evs_.size ())
-       {
-         Stream_event *n = note_evs_.back ();
-         note_evs_.pop_back ();
-         SCM pit = n->get_property ("pitch");
+  for (vsize i = 0; i < note_evs_.size (); i ++)
+    {
+      Stream_event *n = note_evs_[i];
+      SCM pit = n->get_property ("pitch");
 
-         if (Pitch *pitp = unsmob_pitch (pit))
+      if (Pitch *pitp = unsmob_pitch (pit))
+       {
+         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))
            {
-              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;
+             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);
+             if (ev->in_event_class ("tie-event"))
+               tie_event = ev;
+           }
+
+         Moment len = get_event_length (n, now_mom ());
+         
+         Audio_note *p = new Audio_note (*pitp, len, 
+                                         tie_event, transposing.negated ());
+         Audio_element_info info (p, n);
+         announce_element (info);
+         notes_.push_back (p);
+
+         /*
+           shorten previous note.
+          */
+         if (now_mom ().grace_part_)
+           {
+             if (last_start_.grace_part_ == Rational (0))
+               {
+                 for (vsize i = 0; i < last_notes_.size (); i++)
+                   last_notes_[i]->length_mom_ += Moment (0,
+                                                          now_mom().grace_part_);
+               }
            }
        }
-      note_evs_.clear ();
     }
 }
 
 void
 Note_performer::stop_translation_timestep ()
 {
-  // why don't grace notes show up here?
-  // --> grace notes effectively do not get delayed
+  if (note_evs_.size ())
+    {
+      last_notes_ = notes_;
+      last_start_ = now_mom ();
+    }
+
   notes_.clear ();
   note_evs_.clear ();
 }
@@ -93,8 +111,19 @@ Note_performer::listen_note (Stream_event *ev)
   note_evs_.push_back (ev);
 }
 
-ADD_TRANSLATOR (Note_performer, "", "",
-               "", "");
+ADD_TRANSLATOR (Note_performer,
+               /* doc */
+               "",
+
+               /* create */
+               "",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );
 
 Note_performer::Note_performer ()
 {