X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=6bfc82211b73724e7104fa121558bfb903b06776;hb=3bdd4c5935a952447667c3b7658dfe0871c3e51c;hp=d2cfe8dea83e87989e4d7e55c7bec5f3ec775d2d;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index d2cfe8dea8..6bfc82211b 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,123 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "note-performer.hh"
-#include "musical-request.hh"
+#include "performer.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"
 
+#include "translator.icc"
 
-ADD_THIS_TRANSLATOR (Note_performer);
-
-Note_performer::Note_performer ()
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
 {
-}
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
 
-void 
-Note_performer::do_print () const
-{
-#ifndef NPRINT
-  if (note_req_l_arr_.size()>0)
-    for(int i=0;i<note_req_l_arr_.size();i++)
-      note_req_l_arr_[i]->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_arr_.size ())
+  if (note_evs_.size ())
     {
-      int transposing_i = 0;
-      //urg
-      SCM prop = get_property ("transposing", 0);
-      if (gh_number_p(prop)) 
-	transposing_i = gh_scm2int (prop);
+      Pitch transposing;
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop))
+	transposing = *unsmob_pitch (prop);
 
-      while (note_req_l_arr_.size ())
+      while (note_evs_.size ())
 	{
-	  Note_req* n = note_req_l_arr_.pop ();
-	  Audio_note* p = new Audio_note (n->pitch_, n->length_mom (), transposing_i);
-	  Audio_element_info info (p, n);
-	  announce_element (info);
-	  note_p_arr_.push (p);
+	  Stream_event *n = note_evs_.back ();
+	  note_evs_.pop_back ();
+	  SCM pit = n->get_property ("pitch");
+
+	  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;
+                }
+
+	      Audio_note *p = new Audio_note (*pitp, get_event_length (n), 
+                                              tie_event, transposing.negated ());
+	      Audio_element_info info (p, n);
+	      announce_element (info);
+	      notes_.push_back (p);
+	    }
 	}
+      note_evs_.clear ();
     }
 }
 
 void
-Note_performer::process_acknowledged ()
+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 ();
 }
 
-Global_translator*
-Note_performer::global_translator_l ()
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
 {
-  Translator *t = this;
-  Global_translator *global_l =0;
-  do
-    {
-      t = t->daddy_trans_l_ ;
-      global_l = dynamic_cast<Global_translator*> (t);
-    }
-  while (!global_l);
-
-  return global_l;
+  note_evs_.push_back (ev);
 }
 
+ADD_TRANSLATOR (Note_performer, "", "",
+		"", "");
 
-void
-Note_performer::do_pre_move_processing ()
-{
-
-  // 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--;
-	}
-    }
-
-  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::do_try_music (Music* req_l)
+Note_performer::Note_performer ()
 {
-  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
-    {
-      note_req_l_arr_.push (nr);
-      return true;
-    }
-  return false;
 }