release: 1.1.1

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index be234fcdd11d0ae6e0e9907d47c90513289fda2d..d63b433a4fe7b0fdf8cccbd2c328104f5caf042c 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -3,75 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (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 "audio-item.hh"
 #include "debug.hh"
 
-IMPLEMENT_IS_TYPE_B1(Note_performer,Performer);
+IMPLEMENT_IS_TYPE_B1 (Note_performer,Performer);
+ADD_THIS_TRANSLATOR (Note_performer);
 
-ADD_THIS_PERFORMER(Note_performer);
-
-Note_performer::Note_performer()
-{
-    note_req_l_ = 0;
-    off_mom_ = 0;
-}
-
-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();
-       mtor << ( off_mom_ ? "on" : "off" ) << "\n";
-    }
+  if (note_req_l_) 
+    note_req_l_->print ();
 #endif
 }
 
 void 
-Note_performer::process_requests() 
+Note_performer::do_process_requests () 
 {
-    // this is _really_ braindead, but it generates some output
-    if ( !note_req_l_ || !note_req_l_->melodic()  || !note_req_l_->rhythmic() )
-       return;
+  if (note_req_l_)
+    {
+      int transposing_i = 0;
+      //urg
+      Scalar prop = get_property ("transposing");
+      if (!prop.empty_b () && prop.isnum_b ()) 
+       transposing_i = prop;
 
-    // ugh! Midi specific
-    Moment mom = get_mom();
-    if ( !off_mom_ ) { // start note
-       off_mom_ = mom + note_req_l_->duration();
-       play( new Audio_note( note_req_l_, true ) );
-    }
-    else if ( mom == off_mom_ ) { // stop note
-       play( new Audio_note( note_req_l_, false ) );
-       note_req_l_ = 0;
-       off_mom_ = 0;
+
+      play (new Audio_note (note_req_l_, transposing_i));
+
+      note_req_l_ = 0;
     }
 }
 
 bool 
-Note_performer::do_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() )
-// huh?
-       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;
 }