* lily/score.cc (default_rendering): clean protection.

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 246cad751c54801b27325a48247c85231aaac2b8..50a352bed115203f2d057bc407dacc8f2b7623a9 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -16,7 +16,7 @@
 class Key_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Key_performer);
+  TRANSLATOR_DECLARATIONS (Key_performer);
   ~Key_performer ();
 
 protected:
@@ -44,8 +44,11 @@ Key_performer::create_audio_elements ()
 {
   if (key_req_) 
     {
-      SCM pitchlist = key_req_->get_mus_property ("pitch-alist");
-      SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key")); 
+      SCM pitchlist = key_req_->get_property ("pitch-alist");
+      static SCM proc;
+      if (!proc)
+       proc = scm_primitive_eval (ly_symbol2scm ("alterations-in-key"));
+      
       SCM acc = gh_call1 (proc, pitchlist);
       
       Pitch key_do (0, 
@@ -95,7 +98,7 @@ Key_performer::try_music (Music* req)
   return false;
 }
 
-ENTER_DESCRIPTION(Key_performer,
+ENTER_DESCRIPTION (Key_performer,
                  "","",
                  "key-change-event",
                  "","","");