2003 -> 2004

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index c5c522405a6d1d32efe956ebc670c7a9ce938127..02b0baceff030583b02c4be3a657e4ee38077746 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,42 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-translator.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 /**
-Convert reqs to audio notes.
+Convert evs to audio notes.
 */
 class Note_performer : public Performer {
 public:
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(Note_performer);
   
 protected:
-  virtual bool try_music (Music *req_l) ;
+  virtual bool try_music (Music *ev) ;
 
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
-  Global_translator* global_translator_l ();
+  Global_translator* get_global_translator ();
 
 private:
-  Array<Note_req*> note_req_l_arr_;
-  Array<Audio_note*> note_p_arr_;
-  Array<Audio_note*> delayed_p_arr_;
+  Link_array<Music> note_evs_;
+  Link_array<Audio_note> notes_;
+  Link_array<Audio_note> delayeds_;
 };
 
-ADD_THIS_TRANSLATOR (Note_performer);
-
 void 
 Note_performer::create_audio_elements ()
 {
-  if (note_req_l_arr_.size ())
+  if (note_evs_.size ())
     {
       int transposing_i = 0;
       //urg
@@ -46,32 +44,36 @@ Note_performer::create_audio_elements ()
       if (gh_number_p (prop)) 
        transposing_i = gh_scm2int (prop);
 
-      while (note_req_l_arr_.size ())
+      while (note_evs_.size ())
        {
-         Note_req* n = note_req_l_arr_.pop ();
-         Pitch pit =  * unsmob_pitch (n->get_mus_property ("pitch"));
-         Audio_note* p = new Audio_note (pit,  n->length_mom (), transposing_i);
-         Audio_element_info info (p, n);
-         announce_element (info);
-         note_p_arr_.push (p);
+         Music* n = note_evs_.pop ();
+         Pitch *pit =  unsmob_pitch (n->get_mus_property ("pitch"));
+
+         if (pit)
+           {
+             Audio_note* p = new Audio_note (*pit,  n->get_length (), transposing_i);
+             Audio_element_info info (p, n);
+             announce_element (info);
+             notes_.push (p);
+           }
        }
-      note_req_l_arr_.clear ();
+      note_evs_.clear ();
     }
 }
 
 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;
 }
 
 
@@ -81,48 +83,58 @@ 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];
+      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_evs_.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::try_music (Music* req_l)
+Note_performer::try_music (Music* ev)
 {
-  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
+  if (ev->is_mus_type ("note-event"))
     {
-      note_req_l_arr_.push (nr);
+      note_evs_.push (ev);
       return true;
     }
+  else if (ev->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
+  
   return false;
 }
+
+ENTER_DESCRIPTION(Note_performer,"","",
+                 "note-event busy-playing-event","","","");
+
+Note_performer::Note_performer()
+{
+}