X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=8d9dfb44c17c4005d169d54f0cc77435bf2fc709;hb=4f58649894c5e9ad40bb267f52f30001309d9410;hp=430e33c7c765ff06dfd5c30616dd366b17d29f2a;hpb=50802c7203c8e4a3eea1d7bf23064d60cd0d3ec7;p=lilypond.git

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 430e33c7c7..8d9dfb44c1 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,82 +1,101 @@
 /*
   note-performer.cc -- implement Note_performer
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  source file of the GNU LilyPond music typesetter
 
-#include "note-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
-#include "musical-request.hh"
-#include "midi-item.hh"
-#include "debug.hh"
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
+#include "performer.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-context.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-ADD_THIS_PERFORMER(Note_performer);
+#include "translator.icc"
 
-Note_performer::Note_performer()
+/**
+   Convert evs to audio notes.
+*/
+class Note_performer : public Performer
 {
-    note_req_l_ = 0;
-    off_mom_ = 0;
-}
+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_;
+};
 
-Note_performer::~Note_performer()
+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::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
+  notes_.clear ();
+  note_evs_.clear ();
 }
 
-void 
-Note_performer::process_requests() 
+IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
+void
+Note_performer::listen_note (Stream_event *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()  || !note_req_l_->rhythmic() )
-	return;
-
-    // ugh, need to know channel (===track===staff) too
-    int channel_i = get_track_i();
-    Moment mom = get_mom();
-    if ( !off_mom_ ) { // start note
-	off_mom_ = mom + note_req_l_->duration();
-	Midi_note n( note_req_l_->melodic(), channel_i, true );
-	play_event( &n );
-    }
-    else if ( mom == off_mom_ ) {
-	Midi_note n( note_req_l_->melodic(), channel_i, false );
-	play_event( &n );
-	note_req_l_ = 0;
-	off_mom_ = 0;
-    }
+  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;
-    
- // 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() )
-// huh?
-	note_req_l_ = req_l->musical()->melodic();
-    else
-	return false;
-
-    return true;
 }
-