release: 1.3.0

[lilypond.git] / lily / note-performer.cc

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index a96439a92884d6ad253ae146f32c838b72be4c10..f455204067df9a2a76e4463d1f11ed3bdc94de9f 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -9,6 +9,8 @@
 #include "note-performer.hh"
 #include "musical-request.hh"
 #include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-translator.hh"
 #include "debug.hh"
 
 
@@ -22,35 +24,101 @@ void
 Note_performer::do_print () const
 {
 #ifndef NPRINT
-  if (note_req_l_.size()>0)
-    for(int i=0;i<note_req_l_.size();i++)
-      note_req_l_[i]->print ();
+  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_requests () 
 {
-  if (note_req_l_.size()>0)
+  if (note_req_l_arr_.size ())
     {
       int transposing_i = 0;
       //urg
-      Scalar prop = get_property ("transposing", 0);
-      if (!prop.empty_b () && prop.isnum_b ()) 
-       transposing_i = prop;
+      SCM prop = get_property ("transposing", 0);
+      if (SCM_NUMBERP(prop)) 
+       transposing_i = gh_scm2int (prop);
 
-      while(note_req_l_.size()>0)
-       play (new Audio_note (note_req_l_.pop(), transposing_i));
+      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;
 }
 
-bool 
+
+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_.push(nr);
+      note_req_l_arr_.push (nr);
       return true;
     }
   return false;