X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=4aecc396067c9524a73767261d5bf9cdc0150909;hb=90d3cd494153c10b1ae81ed4545c1b6ce4882294;hp=3bdbcb0df33d4396c6e86dc0c92ca4d672b8801a;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 3bdbcb0df3..4aecc39606 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,15 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2006 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 "translator.icc"
+
 /**
    Convert evs to audio notes.
 */
@@ -21,18 +24,17 @@ public:
   TRANSLATOR_DECLARATIONS (Note_performer);
 
 protected:
-  virtual bool try_music (Music *ev);
-
-  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_;
 };
 
 void
-Note_performer::create_audio_elements ()
+Note_performer::process_music ()
 {
   if (note_evs_.size ())
     {
@@ -44,15 +46,31 @@ Note_performer::create_audio_elements ()
 
       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;
+                }
+
+	      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 (p);
+	      notes_.push_back (p);
 	    }
 	}
       note_evs_.clear ();
@@ -64,31 +82,20 @@ 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);
 }
 
 ADD_TRANSLATOR (Note_performer, "", "",
-		"note-event busy-playing-event", "", "", "");
+		"note-event ",
+		"", "");
 
 Note_performer::Note_performer ()
 {