X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=4aecc396067c9524a73767261d5bf9cdc0150909;hb=2c21449528741ee5afa42506a6083f70faf758bb;hp=03d53b1f0898706790c51a8f5d6f9e892cfd6c45;hpb=eeafd68c62481b0d10c292f0e4bfa5d821168c87;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 03d53b1f08..4aecc39606 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,71 +1,102 @@
 /*
   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()
-{
-    // is this what we want? 
-    // or do we need to cache/keep note until it has ended?
-    note_req_l_ = 0;
-}
+  source file of the GNU LilyPond music typesetter
 
-Note_performer::~Note_performer()
-{
-}
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "performer.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-void 
-Note_performer::do_print() const
+#include "translator.icc"
+
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
 {
-#ifndef NPRINT
-    if ( note_req_l_ )
-    	note_req_l_->print();
-#endif
-}
+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_requests() 
+void
+Note_performer::process_music ()
 {
-//    if ( when() == off_mom_ )
-//	play_event( Note_event( current_l_->pitch() ) );
+  if (note_evs_.size ())
+    {
+      int transposing = 0;
 
-//Midi_note( Melodic_req* melreq_l, int channel_i, bool on_bo  )
+      SCM prop = get_property ("instrumentTransposition");
+      if (unsmob_pitch (prop))
+	transposing = unsmob_pitch (prop)->semitone_pitch ();
 
-    // 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 );
+      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 ();
     }
-    note_req_l_ = 0;
 }
 
-bool 
-Note_performer::try_request( Request* req_l )
+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)
 {
-    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;
+  note_evs_.push_back (ev);
 }
 
+ADD_TRANSLATOR (Note_performer, "", "",
+		"note-event ",
+		"", "");
+
+Note_performer::Note_performer ()
+{
+}