release: 1.3.45

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 02e80fca2891fe469aec3c8005cb28d41f8a6b75..ea2668b926c91bd2419836b5f32e0a4d71fbdf8d 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "key-performer.hh"
@@ -12,46 +12,61 @@
 
 
 
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_TRANSLATOR(Key_performer);
 
-Key_performer::Key_performer()
+ADD_THIS_TRANSLATOR (Key_performer);
+
+Key_performer::Key_performer ()
 {
   key_req_l_ = 0;
+  audio_p_ = 0;
 }
 
-Key_performer::~Key_performer()
+Key_performer::~Key_performer ()
 {
 }
 
 void 
-Key_performer::do_print() const
+Key_performer::do_print () const
 {
 #ifndef NPRINT
   if (key_req_l_)
-       key_req_l_->print();
+    key_req_l_->print ();
 #endif
 }
 
 void
-Key_performer::do_process_requests()
+Key_performer::do_process_music ()
 {
-  if (key_req_l_)
-       play (new Audio_key (key_req_l_));
-  key_req_l_ = 0;
+  if (key_req_l_ && key_req_l_->key_)
+    {
+      audio_p_ = new Audio_key (*key_req_l_->key_);
+      Audio_element_info info (audio_p_, key_req_l_);
+      announce_element (info);
+      key_req_l_ = 0;
+    }
 }
 
-bool
-Key_performer::do_try_request (Request* req_l)
+void
+Key_performer::do_pre_move_processing ()
 {
-  if (key_req_l_)
-       return false;
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
+}
 
-  if (req_l->access_Command_req ())
-       key_req_l_ = req_l->access_Command_req ()->access_Key_change_req ();
+bool
+Key_performer::do_try_music (Music* req_l)
+{
+  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+    {
+      if (key_req_l_)
+       warning (_ ("FIXME: key change merge"));
 
-  if (key_req_l_)
-       return true;
+      key_req_l_ = kc;
+      return true;
+    }
 
   return false;
 }