X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=0a9f79f08a378ef8a325ca6b21c26b8e0ea88ecb;hb=9c3ecc7d6e596e8151a58ce7ed0dd9e1b0802d1e;hp=c2665f5495b8fc680e5e25a74114eebf0edef2ea;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index c2665f5495..0a9f79f08a 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,125 +3,128 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
-#include "global-translator.hh"
-#include "debug.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-/**
-Convert reqs to audio notes.
-*/
-class Note_performer : public Performer {
+#include "translator.icc"
+
+class Note_performer : public Performer
+{
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-protected:
-  virtual bool try_music (Music *req_l) ;
+  TRANSLATOR_DECLARATIONS (Note_performer);
 
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-  Global_translator* global_translator_l ();
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
 
+  DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  Array<Note_req*> note_req_l_arr_;
-  Array<Audio_note*> note_p_arr_;
-  Array<Audio_note*> delayed_p_arr_;
-};
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
 
-ADD_THIS_TRANSLATOR (Note_performer);
 
-void 
-Note_performer::create_audio_elements ()
+  vector<Audio_note*> last_notes_;
+  Moment last_start_;
+  
+};
+
+void
+Note_performer::process_music ()
 {
-  if (note_req_l_arr_.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 ++)
     {
-      int transposing_i = 0;
-      //urg
-      SCM prop = get_property ("transposing");
-      if (gh_number_p (prop)) 
-	transposing_i = gh_scm2int (prop);
+      Stream_event *n = note_evs_[i];
+      SCM pit = n->get_property ("pitch");
 
-      while (note_req_l_arr_.size ())
+      if (Pitch *pitp = unsmob_pitch (pit))
 	{
-	  Note_req* n = note_req_l_arr_.pop ();
-	  Pitch pit =  * unsmob_pitch (n->get_mus_property ("pitch"));
-	  Audio_note* p = new Audio_note (pit,  n->length_mom (), transposing_i);
+	  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.negated ());
 	  Audio_element_info info (p, n);
 	  announce_element (info);
-	  note_p_arr_.push (p);
+	  notes_.push_back (p);
+
+	  /*
+	    shorten previous note.
+	   */
+	  if (now_mom ().grace_part_)
+	    {
+	      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_req_l_arr_.clear ();
     }
 }
 
-Global_translator*
-Note_performer::global_translator_l ()
+void
+Note_performer::stop_translation_timestep ()
 {
-  Translator *t = this;
-  Global_translator *global_l =0;
-  do
+  if (note_evs_.size ())
     {
-      t = t->daddy_trans_l_ ;
-      global_l = dynamic_cast<Global_translator*> (t);
+      last_notes_ = notes_;
+      last_start_ = now_mom ();
     }
-  while (!global_l);
 
-  return global_l;
+  notes_.clear ();
+  note_evs_.clear ();
 }
 
-
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
 void
-Note_performer::stop_translation_timestep ()
+Note_performer::listen_note (Stream_event *ev)
 {
+  note_evs_.push_back (ev);
+}
 
-  // why don't grace notes show up here?
-  // --> grace notes effectively do not get delayed
-  Global_translator* global_l = global_translator_l ();
-  for (int i=0; i < note_p_arr_.size (); i++)
-    {
-      Audio_note* n = note_p_arr_[i];
-      if (Moment m= n->delayed_until_mom_)
-	{
-	  global_l->add_moment_to_process (m);
-	  delayed_p_arr_.push (n);
-	  note_p_arr_[i] = 0;
-	  note_p_arr_.del (i);
-	  i--;
-	}
-    }
+ADD_TRANSLATOR (Note_performer,
+		/* doc */
+		"",
 
-  Moment now = now_mom ();
-  for (int i=0; i < note_p_arr_.size (); i++)
-    {
-      play_element (note_p_arr_[i]);
-    }
-  note_p_arr_.clear ();
-  note_req_l_arr_.clear ();
-  for (int i=0; i < delayed_p_arr_.size (); i++)
-    {
-      Audio_note* n = delayed_p_arr_[i];
-      if (n->delayed_until_mom_ <= now)
-	{
-	  play_element (n);
-	  delayed_p_arr_[i] = 0;
-	  delayed_p_arr_.del (i);
-	  i--;
-	}
-    }
-}
- 
-bool
-Note_performer::try_music (Music* req_l)
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);
+
+Note_performer::Note_performer ()
 {
-  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
-    {
-      note_req_l_arr_.push (nr);
-      return true;
-    }
-  return false;
 }