X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=782b4848a2b5f393dc8a32341f970f68e8f444e6;hb=07dc00d6c83be5b05f5ec16f1ed36b1cf41b885c;hp=95adb43ae6c22956a3b76d7fef78c2df06f4231d;hpb=57d6628b46ba1d7ed7c9c0ca7f579567d1912b0d;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 95adb43ae6..782b4848a2 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,17 +1,125 @@
 /*
   note-performer.cc -- implement Note_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1996--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#if 0
 #include "note-performer.hh"
+#include "musical-request.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-translator.hh"
+#include "debug.hh"
 
-void 
-process_request() 
+
+ADD_THIS_TRANSLATOR (Note_performer);
+
+Note_performer::Note_performer ()
 {
-    if ( when() == off_mom_ )
-	play_event( Note_event( current_l_->pitch() ) );
 }
+
+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
+}
+
+void 
+Note_performer::do_process_music () 
+{
+  if (note_req_l_arr_.size ())
+    {
+      int transposing_i = 0;
+      //urg
+      SCM prop = get_property ("transposing");
+      if (gh_number_p(prop)) 
+	transposing_i = gh_scm2int (prop);
+
+      while (note_req_l_arr_.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);
+	}
+    }
+}
+
+void
+Note_performer::process_acknowledged ()
+{
+}
+
+Global_translator*
+Note_performer::global_translator_l ()
+{
+  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;
+}
+
+
+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)
+{
+  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
+    {
+      note_req_l_arr_.push (nr);
+      return true;
+    }
+  return false;
+}