Run `make grand-replace'.

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 98cdbff87402b5bf3c2aaf0aaf997e7c7c4cea36..7b664fd91ebb0dffef62bd9d1d42b2f8c0878fb4 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,119 +3,127 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
-/**
-Convert evs to audio notes.
-*/
-class Note_performer : public Performer {
+#include "translator.icc"
+
+class Note_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Note_performer);
-  
+
 protected:
-  virtual bool try_music (Music *ev) ;
+  void stop_translation_timestep ();
+  void process_music ();
 
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
- 
+  DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  Link_array<Music> note_evs_;
-  Link_array<Audio_note> notes_;
-  Link_array<Audio_note> delayeds_;
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
+
+
+  vector<Audio_note*> last_notes_;
+  Moment last_start_;
+  
 };
 
-void 
-Note_performer::create_audio_elements ()
+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)->semitone_pitch ();
+  Pitch transposing;
+  SCM prop = get_property ("instrumentTransposition");
+  if (unsmob_pitch (prop))
+    transposing = *unsmob_pitch (prop);
+
+  for (vsize i = 0; i < note_evs_.size (); i ++)
+    {
+      Stream_event *n = note_evs_[i];
+      SCM pit = n->get_property ("pitch");
 
-      while (note_evs_.size ())
+      if (Pitch *pitp = unsmob_pitch (pit))
        {
-         Music* n = note_evs_.pop ();
-         SCM pit =  n->get_property ("pitch");
+         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;
+           }
 
-         if (Pitch * pitp = unsmob_pitch (pit))
+         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_)
            {
-             Audio_note* p = new Audio_note (*pitp,  n->get_length (),  - transposing);
-             Audio_element_info info (p, n);
-             announce_element (info);
-             notes_.push (p);
+             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
-  Global_context * global = get_global_context ();
-  for (int i = 0; i < notes_.size (); i++)
+  if (note_evs_.size ())
     {
-      Audio_note* n = notes_[i];
-      Moment m = n->delayed_until_mom_;
-      if (m.to_bool ())
-       {
-         global->add_moment_to_process (m);
-         delayeds_.push (n);
-         notes_[i] = 0;
-         notes_.del (i);
-         i--;
-       }
+      last_notes_ = notes_;
+      last_start_ = now_mom ();
     }
 
-  Moment now = now_mom ();
-  for (int i = 0; i < notes_.size (); i++)
-    {
-      play_element (notes_[i]);
-    }
   notes_.clear ();
   note_evs_.clear ();
-  for (int i = 0; i < delayeds_.size (); i++)
-    {
-      Audio_note* n = delayeds_[i];
-      if (n->delayed_until_mom_ <= now)
-       {
-         play_element (n);
-         delayeds_[i] = 0;
-         delayeds_.del (i);
-         i--;
-       }
-    }
 }
- 
-bool
-Note_performer::try_music (Music* ev)
+
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
 {
-  if (ev->is_mus_type ("note-event"))
-    {
-      note_evs_.push (ev);
-      return true;
-    }
-  else if (ev->is_mus_type ("busy-playing-event"))
-    return note_evs_.size ();
-  
-  return false;
+  note_evs_.push_back (ev);
 }
 
-ADD_TRANSLATOR (Note_performer, "", "",
-                 "note-event busy-playing-event", "", "", "");
+ADD_TRANSLATOR (Note_performer,
+               /* doc */
+               "",
+
+               /* create */
+               "",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );
 
 Note_performer::Note_performer ()
 {