X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-performer.cc;h=ff296311ffead109a8de2936f8542a3170b8aa0d;hb=bcfda82911036559d8fb5681efb9ba2efeddeb3d;hp=d63b433a4fe7b0fdf8cccbd2c328104f5caf042c;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index d63b433a4f..ff296311ff 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,59 +3,105 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "note-performer.hh"
-#include "musical-request.hh"
+#include "performer.hh"
 #include "audio-item.hh"
-#include "debug.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-IMPLEMENT_IS_TYPE_B1 (Note_performer,Performer);
-ADD_THIS_TRANSLATOR (Note_performer);
+#include "translator.icc"
 
-Note_performer::Note_performer ()
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
 {
-  note_req_l_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
 
-void 
-Note_performer::do_print () const
-{
-#ifndef NPRINT
-  if (note_req_l_) 
-    note_req_l_->print ();
-#endif
-}
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
 
-void 
-Note_performer::do_process_requests () 
+  DECLARE_TRANSLATOR_LISTENER (note);
+private:
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
+};
+
+void
+Note_performer::process_music ()
 {
-  if (note_req_l_)
+  if (note_evs_.size ())
     {
-      int transposing_i = 0;
-      //urg
-      Scalar prop = get_property ("transposing");
-      if (!prop.empty_b () && prop.isnum_b ()) 
-	transposing_i = prop;
+      Pitch transposing;
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop))
+	transposing = *unsmob_pitch (prop);
 
+      while (note_evs_.size ())
+	{
+	  Stream_event *n = note_evs_.back ();
+	  note_evs_.pop_back ();
+	  SCM pit = n->get_property ("pitch");
 
-      play (new Audio_note (note_req_l_, transposing_i));
+	  if (Pitch *pitp = unsmob_pitch (pit))
+	    {
+              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;
+                }
 
-      note_req_l_ = 0;
+	      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_back (p);
+	    }
+	}
+      note_evs_.clear ();
     }
 }
 
-bool 
-Note_performer::do_try_request (Request* req_l)
+void
+Note_performer::stop_translation_timestep ()
+{
+  // why don't grace notes show up here?
+  // --> grace notes effectively do not get delayed
+  notes_.clear ();
+  note_evs_.clear ();
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
+{
+  note_evs_.push_back (ev);
+}
+
+ADD_TRANSLATOR (Note_performer, "", "",
+		"", "");
+
+Note_performer::Note_performer ()
 {
-  if (note_req_l_)
-    return false;
-  
-  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
-    {
-      note_req_l_ = nr;
-      return true;
-    }
-  return false;
 }