Update d/copyright

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index a5b4afce87f35d2d430ab8dd85722ef1a5bc471e..ddf9fe39213e0d74910ce75a268808ad254d424c 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,9 +1,20 @@
 /*
-  note-performer.cc -- implement Note_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "performer.hh"
@@ -15,9 +26,6 @@
 
 #include "translator.icc"
 
-/**
-   Convert evs to audio notes.
-*/
 class Note_performer : public Performer
 {
 public:
@@ -29,58 +37,82 @@ protected:
 
   DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  vector<Stream_event*> note_evs_;
-  vector<Audio_note*> notes_;
+  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 ())
+  if (!note_evs_.size ())
+    return;
+
+  Pitch transposing;
+  SCM prop = get_property ("instrumentTransposition");
+  if (unsmob_pitch (prop))
+    transposing = *unsmob_pitch (prop);
+
+  for (vsize i = 0; i < note_evs_.size (); i++)
     {
-      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");
-
-         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))
+      Stream_event *n = note_evs_[i];
+      SCM pit = n->get_property ("pitch");
+
+      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))
+            {
+              Stream_event *ev = unsmob_stream_event (scm_car (s));
+              if (!ev)
+                continue;
+
+              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);
+          Audio_element_info info (p, n);
+          announce_element (info);
+          notes_.push_back (p);
+
+          /*
+            Shorten previous note. If it was part of a tie, shorten
+            the first note in the tie.
+           */
+          if (now_mom ().grace_part_)
+            {
+              if (last_start_.grace_part_ == Rational (0))
                 {
-                  Stream_event *ev = unsmob_stream_event (scm_car (s));
-                  if (!ev)
-                    continue;
-         
-                  if (ev->in_event_class ("tie-event"))
-                    tie_event = ev;
+                  for (vsize i = 0; i < last_notes_.size (); i++)
+                    {
+                      Audio_note *tie_head = last_notes_[i]->tie_head ();
+                      tie_head->length_mom_ += Moment (0, now_mom ().grace_part_);
+                    }
                 }
-
-             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);
-           }
-       }
-      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 ();
 }
@@ -92,8 +124,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 ()
 {