(ly_module_define): only define variable if

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index bda50b6188a6e9712b9087c286b84e51ff7a24bf..4d938dee650282bf227b8eb9e525f385b28ab7d2 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,59 +3,121 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "note-performer.hh"
-#include "musical-request.hh"
+#include "performer.hh"
+#include "event.hh"
 #include "audio-item.hh"
-#include "debug.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "warn.hh"
 
+/**
+Convert evs to audio notes.
+*/
+class Note_performer : public Performer {
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
+  
+protected:
+  virtual bool try_music (Music *ev) ;
 
-ADD_THIS_TRANSLATOR (Note_performer);
-
-Note_performer::Note_performer ()
-{
-  note_req_l_ = 0;
-}
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+ 
+private:
+  Link_array<Music> note_evs_;
+  Link_array<Audio_note> notes_;
+  Link_array<Audio_note> delayeds_;
+};
 
 void 
-Note_performer::do_print () const
+Note_performer::create_audio_elements ()
 {
-#ifndef NPRINT
-  if (note_req_l_) 
-    note_req_l_->print ();
-#endif
-}
-
-void 
-Note_performer::do_process_requests () 
-{
-  if (note_req_l_)
+  if (note_evs_.size ())
     {
-      int transposing_i = 0;
-      //urg
-      Scalar prop = get_property ("transposing");
-      if (!prop.empty_b () && prop.isnum_b ()) 
-       transposing_i = prop;
+      int transposing = 0;
 
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop)) 
+       transposing = unsmob_pitch (prop)->semitone_pitch ();
 
-      play (new Audio_note (note_req_l_, transposing_i));
+      while (note_evs_.size ())
+       {
+         Music* n = note_evs_.pop ();
+         SCM pit =  n->get_property ("pitch");
 
-      note_req_l_ = 0;
+         if (Pitch * pitp = unsmob_pitch (pit))
+           {
+             Audio_note* p = new Audio_note (*pitp,  n->get_length (), transposing);
+             Audio_element_info info (p, n);
+             announce_element (info);
+             notes_.push (p);
+           }
+       }
+      note_evs_.clear ();
     }
 }
 
-bool 
-Note_performer::do_try_music (Music* req_l)
+
+void
+Note_performer::stop_translation_timestep ()
 {
-  if (note_req_l_)
-    return false;
-  
-  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
+  // why don't grace notes show up here?
+  // --> grace notes effectively do not get delayed
+  Global_context * global = get_global_context ();
+  for (int i=0; i < notes_.size (); i++)
+    {
+      Audio_note* n = notes_[i];
+      Moment m= n->delayed_until_mom_;
+      if (m.to_bool ())
+       {
+         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 < notes_.size (); i++)
+    {
+      play_element (notes_[i]);
+    }
+  notes_.clear ();
+  note_evs_.clear ();
+  for (int i=0; i < delayeds_.size (); i++)
+    {
+      Audio_note* n = delayeds_[i];
+      if (n->delayed_until_mom_ <= now)
+       {
+         play_element (n);
+         delayeds_[i] = 0;
+         delayeds_.del (i);
+         i--;
+       }
+    }
+}
+ 
+bool
+Note_performer::try_music (Music* ev)
+{
+  if (ev->is_mus_type ("note-event"))
     {
-      note_req_l_ = 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 ()
+{
+}