X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=435575da604b1b66eecf109cc0df4cf452c9e221;hb=d40cd7d24fb9d43ca880777d8a671b90d5d809da;hp=4ac5f0ebb53f1d3d63c4f4d471bfab986a95a9ca;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 4ac5f0ebb5..435575da60 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,96 +3,127 @@
 
   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"
 
-/**
-   Convert evs to audio notes.
-*/
+#include "translator.icc"
+
 class Note_performer : public Performer
 {
 public:
   TRANSLATOR_DECLARATIONS (Note_performer);
 
 protected:
-  virtual bool try_music (Music *ev);
-
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual void create_audio_elements ();
+  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_;
+
+
+  vector<Audio_note*> last_notes_;
+  Moment last_start_;
+  
 };
 
 void
-Note_performer::create_audio_elements ()
+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);
 
-      while (note_evs_.size ())
+  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))
 	{
-	  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
-  Moment now = now_mom ();
-  for (int i = 0; i < notes_.size (); i++)
+  if (note_evs_.size ())
     {
-      play_element (notes_[i]);
+      last_notes_ = notes_;
+      last_start_ = now_mom ();
     }
+
   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,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
 
-ADD_TRANSLATOR (Note_performer, "", "",
-		"note-event busy-playing-event",
-		 "", "");
+		/* write */
+		""
+		);
 
 Note_performer::Note_performer ()
 {