Merge branch 'master' of git+ssh://jneem@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 7cbaf1133d94b324b8f141d0704c7c7fba956e16..ff296311ffead109a8de2936f8542a3170b8aa0d 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,15 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2007 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"
-#include "music.hh"
+
+#include "translator.icc"
 
 /**
    Convert evs to audio notes.
@@ -22,14 +24,13 @@ public:
   TRANSLATOR_DECLARATIONS (Note_performer);
 
 protected:
-  virtual bool try_music (Music *ev);
-
   void stop_translation_timestep ();
   void process_music ();
 
+  DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  Link_array<Music> note_evs_;
-  Link_array<Audio_note> notes_;
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
 };
 
 void
@@ -37,23 +38,45 @@ Note_performer::process_music ()
 {
   if (note_evs_.size ())
     {
-      int transposing = 0;
-
+      Pitch transposing;
       SCM prop = get_property ("instrumentTransposition");
       if (unsmob_pitch (prop))
-       transposing = unsmob_pitch (prop)->semitone_pitch ();
+       transposing = *unsmob_pitch (prop);
 
       while (note_evs_.size ())
        {
-         Music *n = note_evs_.pop ();
+         Stream_event *n = note_evs_.back ();
+         note_evs_.pop_back ();
          SCM pit = n->get_property ("pitch");
 
          if (Pitch *pitp = unsmob_pitch (pit))
            {
-             Audio_note *p = new Audio_note (*pitp, n->get_length (), - 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;
+                }
+
+             Moment len = get_event_length (n);
+             if (now_mom().grace_part_)
+               {
+                 len.grace_part_ = len.main_part_;
+                 len.main_part_ = Rational (0);
+               }
+             
+             Audio_note *p = new Audio_note (*pitp, len, 
+                                              tie_event, transposing.negated ());
              Audio_element_info info (p, n);
              announce_element (info);
-             notes_.push (p);
+             notes_.push_back (p);
            }
        }
       note_evs_.clear ();
@@ -65,32 +88,18 @@ 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 (int i = 0; i < notes_.size (); i++)
-    play_element (notes_[i]);
   notes_.clear ();
   note_evs_.clear ();
 }
 
-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);
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Note_performer, "", "",
-               "note-event "
-               "busy-playing-event",
                "", "");
 
 Note_performer::Note_performer ()