Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index d63b433a4fe7b0fdf8cccbd2c328104f5caf042c..331e7cc60ff7ed4b9bfe710a23dbadfcf63b41d4 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,59 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "note-performer.hh"
-#include "musical-request.hh"
+#include "performer.hh"
 #include "audio-item.hh"
-#include "debug.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "warn.hh"
+#include "music.hh"
 
-IMPLEMENT_IS_TYPE_B1 (Note_performer,Performer);
-ADD_THIS_TRANSLATOR (Note_performer);
-
-Note_performer::Note_performer ()
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
 {
-  note_req_l_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
 
-void 
-Note_performer::do_print () const
-{
-#ifndef NPRINT
-  if (note_req_l_) 
-    note_req_l_->print ();
-#endif
-}
+protected:
+  virtual bool try_music (Music *ev);
 
-void 
-Note_performer::do_process_requests () 
+  void stop_translation_timestep ();
+  void process_music ();
+
+private:
+  vector<Music*> note_evs_;
+  vector<Audio_note*> notes_;
+};
+
+void
+Note_performer::process_music ()
 {
-  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_.back ();
+         note_evs_.pop_back ();
+         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_back (p);
+           }
+       }
+      note_evs_.clear ();
     }
 }
 
-bool 
-Note_performer::do_try_request (Request* 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
+  Moment now = now_mom ();
+  for (vsize i = 0; i < notes_.size (); i++)
+    play_element (notes_[i]);
+  notes_.clear ();
+  note_evs_.clear ();
+}
+
+bool
+Note_performer::try_music (Music *ev)
+{
+  if (ev->is_mus_type ("note-event"))
     {
-      note_req_l_ = nr;
+      note_evs_.push_back (ev);
       return true;
     }
+  else if (ev->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
+
   return false;
 }
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Note_performer, "", "",
+               "note-event "
+               "busy-playing-event",
+               "", "");
+
+Note_performer::Note_performer ()
+{
+}