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 03d53b1f0898706790c51a8f5d6f9e892cfd6c45..331e7cc60ff7ed4b9bfe710a23dbadfcf63b41d4 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,71 +1,99 @@
 /*
   note-performer.cc -- implement Note_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
-
-#include "note-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
-#include "musical-request.hh"
-#include "midi-item.hh"
-#include "debug.hh"
-
-IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
-IMPLEMENT_STATIC_NAME(Note_performer);
-ADD_THIS_PERFORMER(Note_performer);
-
-Note_performer::Note_performer()
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "performer.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "warn.hh"
+#include "music.hh"
+
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
 {
-    // is this what we want? 
-    // or do we need to cache/keep note until it has ended?
-    note_req_l_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
+
+protected:
+  virtual bool try_music (Music *ev);
 
-Note_performer::~Note_performer()
+  void stop_translation_timestep ();
+  void process_music ();
+
+private:
+  vector<Music*> note_evs_;
+  vector<Audio_note*> notes_;
+};
+
+void
+Note_performer::process_music ()
 {
+  if (note_evs_.size ())
+    {
+      int transposing = 0;
+
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop))
+       transposing = unsmob_pitch (prop)->semitone_pitch ();
+
+      while (note_evs_.size ())
+       {
+         Music *n = note_evs_.back ();
+         note_evs_.pop_back ();
+         SCM pit = n->get_property ("pitch");
+
+         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 ();
+    }
 }
 
-void 
-Note_performer::do_print() const
+void
+Note_performer::stop_translation_timestep ()
 {
-#ifndef NPRINT
-    if ( note_req_l_ )
-       note_req_l_->print();
-#endif
+  // 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 ();
 }
 
-void 
-Note_performer::process_requests() 
+bool
+Note_performer::try_music (Music *ev)
 {
-//    if ( when() == off_mom_ )
-//     play_event( Note_event( current_l_->pitch() ) );
-
-//Midi_note( Melodic_req* melreq_l, int channel_i, bool on_bo  )
-
-    // this is _really_ braindead, but it generates some output
-    if ( note_req_l_ && note_req_l_->melodic() ) {
-       Midi_note n( note_req_l_->melodic(), 0, true  );
-       play_event( &n );
+  if (ev->is_mus_type ("note-event"))
+    {
+      note_evs_.push_back (ev);
+      return true;
     }
-    note_req_l_ = 0;
+  else if (ev->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
+
+  return false;
 }
 
-bool 
-Note_performer::try_request( Request* req_l )
+#include "translator.icc"
+
+ADD_TRANSLATOR (Note_performer, "", "",
+               "note-event "
+               "busy-playing-event",
+               "", "");
+
+Note_performer::Note_performer ()
 {
-    if ( note_req_l_ )
-       return false;
-    
- // huh?
-//    if (req_l->musical() && (req_l->musical()->note() || req_l->musical()->rest()))
-//     note_req_l_ = req_l->musical()->rhythmic();
-    if ( req_l->musical() && req_l->musical()->note() )
-       note_req_l_ = req_l->musical()->melodic();
-    else
-       return false;
-
-    return true;
 }
-