release: 1.5.19

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 1f88de4aadaf59dd8e42689887810ea079a37bab..a7d2907daeddb2e70b60030612f75a13c2a65abd 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,60 +3,60 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2001 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "note-performer.hh"
+#include "performer.hh"
 #include "musical-request.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
-}
+/**
+Convert reqs to audio notes.
+*/
+class Note_performer : public Performer {
+public:
+  TRANSLATOR_DECLARATIONS(Note_performer);
+  
+protected:
+  virtual bool try_music (Music *req_l) ;
+
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+  Global_translator* global_translator_l ();
+
+private:
+  Array<Note_req*> note_req_l_arr_;
+  Array<Audio_note*> note_p_arr_;
+  Array<Audio_note*> delayed_p_arr_;
+};
 
 void 
-Note_performer::do_process_requests () 
+Note_performer::create_audio_elements ()
 {
   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");
+      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);
+         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);
        }
+      note_req_l_arr_.clear ();
     }
 }
 
-void
-Note_performer::process_acknowledged ()
-{
-}
-
 Global_translator*
 Note_performer::global_translator_l ()
 {
@@ -74,7 +74,7 @@ Note_performer::global_translator_l ()
 
 
 void
-Note_performer::do_pre_move_processing ()
+Note_performer::stop_translation_timestep ()
 {
 
   // why don't grace notes show up here?
@@ -83,7 +83,8 @@ Note_performer::do_pre_move_processing ()
   for (int i=0; i < note_p_arr_.size (); i++)
     {
       Audio_note* n = note_p_arr_[i];
-      if (Moment m= n->delayed_until_mom_)
+      Moment m= n->delayed_until_mom_;
+      if (m.to_bool ())
        {
          global_l->add_moment_to_process (m);
          delayed_p_arr_.push (n);
@@ -114,7 +115,7 @@ Note_performer::do_pre_move_processing ()
 }
  
 bool
-Note_performer::do_try_music (Music* req_l)
+Note_performer::try_music (Music* req_l)
 {
   if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
     {
@@ -123,3 +124,9 @@ Note_performer::do_try_music (Music* req_l)
     }
   return false;
 }
+
+ENTER_DESCRIPTION(Note_performer,"","","","","");
+
+Note_performer::Note_performer()
+{
+}