release: 1.3.45

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 14d73dbbb9fd3539030d00400b3ab695dab701d8..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--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "key-performer.hh"
@@ -35,11 +35,11 @@ Key_performer::do_print () const
 }
 
 void
-Key_performer::do_process_requests ()
+Key_performer::do_process_music ()
 {
-  if (key_req_l_)
+  if (key_req_l_ && key_req_l_->key_)
     {
-      audio_p_ = new Audio_key (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;
@@ -62,7 +62,7 @@ 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;