Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 95adb43ae6c22956a3b76d7fef78c2df06f4231d..8d9dfb44c17c4005d169d54f0cc77435bf2fc709 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,17 +1,101 @@
 /*
   note-performer.cc -- implement Note_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  source file of the GNU LilyPond music typesetter
 
-#if 0
-#include "note-performer.hh"
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-void 
-process_request() 
+#include "performer.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
+
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Note_performer);
+
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
+
+  DECLARE_TRANSLATOR_LISTENER (note);
+private:
+  vector<Stream_event*> 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 ())
+       {
+         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);
+             Audio_element_info info (p, n);
+             announce_element (info);
+             notes_.push_back (p);
+           }
+       }
+      note_evs_.clear ();
+    }
+}
+
+void
+Note_performer::stop_translation_timestep ()
+{
+  // why don't grace notes show up here?
+  // --> grace notes effectively do not get delayed
+  notes_.clear ();
+  note_evs_.clear ();
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *ev)
+{
+  note_evs_.push_back (ev);
+}
+
+ADD_TRANSLATOR (Note_performer, "", "",
+               "", "");
+
+Note_performer::Note_performer ()
 {
-    if ( when() == off_mom_ )
-       play_event( Note_event( current_l_->pitch() ) );
 }
-#endif