release: 1.1.1

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 03d53b1f0898706790c51a8f5d6f9e892cfd6c45..d63b433a4fe7b0fdf8cccbd2c328104f5caf042c 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,71 +1,61 @@
 /*
   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
+
+  (c) 1996,  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "note-performer.hh"
-#include "translator.hh"
-#include "input-translator.hh"
 #include "musical-request.hh"
-#include "midi-item.hh"
+#include "audio-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;
-}
+IMPLEMENT_IS_TYPE_B1 (Note_performer,Performer);
+ADD_THIS_TRANSLATOR (Note_performer);
 
-Note_performer::~Note_performer()
+Note_performer::Note_performer ()
 {
+  note_req_l_ = 0;
 }
 
 void 
-Note_performer::do_print() const
+Note_performer::do_print () const
 {
 #ifndef NPRINT
-    if ( note_req_l_ )
-       note_req_l_->print();
+  if (note_req_l_) 
+    note_req_l_->print ();
 #endif
 }
 
 void 
-Note_performer::process_requests() 
+Note_performer::do_process_requests () 
 {
-//    if ( when() == off_mom_ )
-//     play_event( Note_event( current_l_->pitch() ) );
+  if (note_req_l_)
+    {
+      int transposing_i = 0;
+      //urg
+      Scalar prop = get_property ("transposing");
+      if (!prop.empty_b () && prop.isnum_b ()) 
+       transposing_i = prop;
 
-//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 );
+      play (new Audio_note (note_req_l_, transposing_i));
+
+      note_req_l_ = 0;
     }
-    note_req_l_ = 0;
 }
 
 bool 
-Note_performer::try_request( Request* req_l )
+Note_performer::do_try_request (Request* req_l)
 {
-    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;
+  if (note_req_l_)
+    return false;
+  
+  if (Note_req *nr = dynamic_cast <Note_req *> (req_l))
+    {
+      note_req_l_ = nr;
+      return true;
+    }
+  return false;
 }
-