Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index dd2ac9da14b8d063210cf06fc7975565e4265a33..6bfc82211b73724e7104fa121558bfb903b06776 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,56 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "note-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
-#include "musical-request.hh"
+#include "performer.hh"
 #include "audio-item.hh"
-#include "debug.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
+#include "translator.icc"
 
-ADD_THIS_PERFORMER(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);
+
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
 
-void 
-Note_performer::do_print() const
+  DECLARE_TRANSLATOR_LISTENER (note);
+private:
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
+};
+
+void
+Note_performer::process_music ()
 {
-#ifndef NPRINT
-  if ( note_req_l_) 
+  if (note_evs_.size ())
     {
-       note_req_l_->print();
+      Pitch transposing;
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop))
+       transposing = *unsmob_pitch (prop);
+
+      while (note_evs_.size ())
+       {
+         Stream_event *n = note_evs_.back ();
+         note_evs_.pop_back ();
+         SCM pit = n->get_property ("pitch");
+
+         if (Pitch *pitp = unsmob_pitch (pit))
+           {
+              SCM articulations = n->get_property ("articulations");
+              Stream_event *tie_event = 0;
+              for (SCM s = articulations;
+                   !tie_event && scm_is_pair (s);
+                   s = scm_cdr (s))
+                {
+                  Stream_event *ev = unsmob_stream_event (scm_car (s));
+                  if (!ev)
+                    continue;
+         
+                  if (ev->in_event_class ("tie-event"))
+                    tie_event = ev;
+                }
+
+             Audio_note *p = new Audio_note (*pitp, get_event_length (n), 
+                                              tie_event, transposing.negated ());
+             Audio_element_info info (p, n);
+             announce_element (info);
+             notes_.push_back (p);
+           }
+       }
+      note_evs_.clear ();
     }
-#endif
 }
 
-void 
-Note_performer::process_requests() 
+void
+Note_performer::stop_translation_timestep ()
 {
-  // this is _really_ braindead, but it generates some output
-  if ( !note_req_l_ || !note_req_l_->melodic()  || !note_req_l_->rhythmic ())
-       return;
+  // why don't grace notes show up here?
+  // --> grace notes effectively do not get delayed
+  notes_.clear ();
+  note_evs_.clear ();
+}
 
-  play (new Audio_note (note_req_l_) );
-  note_req_l_ = 0;
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
+{
+  note_evs_.push_back (ev);
 }
 
-bool 
-Note_performer::do_try_request (Request* req_l)
+ADD_TRANSLATOR (Note_performer, "", "",
+               "", "");
+
+Note_performer::Note_performer ()
 {
-  if ( note_req_l_)
-       return false;
-  
-  if ( !req_l->musical() || !req_l->musical ()->note ())
-       return false;
-
-  note_req_l_ = req_l->musical()->melodic ();
-  return true;
 }