X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=99d172f8eaf32ecc2b02b00333860d2d396af75a;hb=de2b6d04ee98783f86b02047e41ee672f97a813d;hp=25a49c2f8591ff34d540461ab0485fc6d6716d4b;hpb=685452c8675e89a84692420fb9891756d318e771;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 25a49c2f85..99d172f8ea 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,123 +3,130 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2003 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "note-performer.hh"
-#include "musical-request.hh"
+#include "performer.hh"
+#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-translator.hh"
-#include "debug.hh"
-
-
-ADD_THIS_TRANSLATOR (Note_performer);
-
-Note_performer::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
-}
+#include "warn.hh"
+
+/**
+Convert reqs to audio notes.
+*/
+class Note_performer : public Performer {
+public:
+  TRANSLATOR_DECLARATIONS(Note_performer);
+  
+protected:
+  virtual bool try_music (Music *req) ;
+
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+  Global_translator* get_global_translator ();
+
+private:
+  Link_array<Music> note_reqs_;
+  Link_array<Audio_note> notes_;
+  Link_array<Audio_note> delayeds_;
+};
 
 void 
-Note_performer::do_process_requests () 
+Note_performer::create_audio_elements ()
 {
-  if (note_req_l_arr_.size ())
+  if (note_reqs_.size ())
     {
       int transposing_i = 0;
       //urg
-      SCM prop = get_property ("transposing", 0);
-      if (gh_number_p(prop)) 
+      SCM prop = get_property ("transposing");
+      if (gh_number_p (prop)) 
 	transposing_i = gh_scm2int (prop);
 
-      while (note_req_l_arr_.size ())
+      while (note_reqs_.size ())
 	{
-	  Note_req* n = note_req_l_arr_.pop ();
-	  Audio_note* p = new Audio_note (n->pitch_, n->length_mom (), transposing_i);
+	  Music* n = note_reqs_.pop ();
+	  Pitch pit =  * unsmob_pitch (n->get_mus_property ("pitch"));
+	  Audio_note* p = new Audio_note (pit,  n->get_length (), transposing_i);
 	  Audio_element_info info (p, n);
 	  announce_element (info);
-	  note_p_arr_.push (p);
+	  notes_.push (p);
 	}
+      note_reqs_.clear ();
     }
 }
 
-void
-Note_performer::process_acknowledged ()
-{
-}
-
 Global_translator*
-Note_performer::global_translator_l ()
+Note_performer::get_global_translator ()
 {
   Translator *t = this;
-  Global_translator *global_l =0;
+  Global_translator *global =0;
   do
     {
-      t = t->daddy_trans_l_ ;
-      global_l = dynamic_cast<Global_translator*> (t);
+      t = t->daddy_trans_ ;
+      global = dynamic_cast<Global_translator*> (t);
     }
-  while (!global_l);
+  while (!global);
 
-  return global_l;
+  return global;
 }
 
 
 void
-Note_performer::do_pre_move_processing ()
+Note_performer::stop_translation_timestep ()
 {
 
   // 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++)
+  Global_translator* global = get_global_translator ();
+  for (int i=0; i < notes_.size (); i++)
     {
-      Audio_note* n = note_p_arr_[i];
-      if (Moment m= n->delayed_until_mom_)
+      Audio_note* n = notes_[i];
+      Moment m= n->delayed_until_mom_;
+      if (m.to_bool ())
 	{
-	  global_l->add_moment_to_process (m);
-	  delayed_p_arr_.push (n);
-	  note_p_arr_[i] = 0;
-	  note_p_arr_.del (i);
+	  global->add_moment_to_process (m);
+	  delayeds_.push (n);
+	  notes_[i] = 0;
+	  notes_.del (i);
 	  i--;
 	}
     }
 
   Moment now = now_mom ();
-  for (int i=0; i < note_p_arr_.size (); i++)
+  for (int i=0; i < notes_.size (); i++)
     {
-      play_element (note_p_arr_[i]);
+      play_element (notes_[i]);
     }
-  note_p_arr_.clear ();
-  note_req_l_arr_.clear ();
-  for (int i=0; i < delayed_p_arr_.size (); i++)
+  notes_.clear ();
+  note_reqs_.clear ();
+  for (int i=0; i < delayeds_.size (); i++)
     {
-      Audio_note* n = delayed_p_arr_[i];
+      Audio_note* n = delayeds_[i];
       if (n->delayed_until_mom_ <= now)
 	{
 	  play_element (n);
-	  delayed_p_arr_[i] = 0;
-	  delayed_p_arr_.del (i);
+	  delayeds_[i] = 0;
+	  delayeds_.del (i);
 	  i--;
 	}
     }
 }
  
 bool
-Note_performer::do_try_music (Music* req_l)
+Note_performer::try_music (Music* req)
 {
-  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
+  if (req->is_mus_type ("note-event"))
     {
-      note_req_l_arr_.push (nr);
+      note_reqs_.push (req);
       return true;
     }
   return false;
 }
+
+ENTER_DESCRIPTION(Note_performer,"","","note-event","","","");
+
+Note_performer::Note_performer()
+{
+}