patch::: 1.3.108.jcn3

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index b163e4022fc17d229d967d1e9e6b20ede1d37a4f..77fb5c74e79c30e73bb2915658ea27dc38ec30cf 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"
@@ -11,43 +11,48 @@
 #include "audio-item.hh"
 
 
+ADD_THIS_TRANSLATOR (Key_performer);
 
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_TRANSLATOR(Key_performer);
-
-Key_performer::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
+void
+Key_performer::deprecated_process_music ()
 {
-#ifndef NPRINT
-  if (key_req_l_)
-    key_req_l_->print();
-#endif
+  if (key_req_l_ &&
+      gh_list_p (key_req_l_->get_mus_property ("pitch-alist")))
+    {
+      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;
+    }
 }
 
 void
-Key_performer::do_process_requests()
+Key_performer::do_pre_move_processing ()
 {
-  if (key_req_l_)
-    play (new Audio_key (key_req_l_));
-  key_req_l_ = 0;
+  if (audio_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
+    }
 }
 
 bool
-Key_performer::do_try_request (Request* req_l)
+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");
+       warning (_ ("FIXME: key change merge"));
 
       key_req_l_ = kc;
       return true;