X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=c9ced39f6ab631d1d43891859a55ed880d1e1cf7;hb=6b93aa32e32d736202d803c68f5156cc253a5f7c;hp=246cad751c54801b27325a48247c85231aaac2b8;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 246cad751c..c9ced39f6a 100644
--- 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,9 @@ 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");
+      SCM proc = ly_scheme_function ("alterations-in-key");
+      
       SCM acc = gh_call1 (proc, pitchlist);
       
       Pitch key_do (0, 
@@ -60,7 +61,7 @@ Key_performer::create_audio_elements ()
 
       /* MIDI keys are too limited for lilypond scales.
 	 We check for minor scale and assume major otherwise.  */
-      SCM minor = scm_primitive_eval (ly_symbol2scm ("minor"));
+      SCM minor = scm_c_eval_string ("minor");
       audio_ = new Audio_key (gh_scm2int (acc),
 			      SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
 
@@ -95,7 +96,7 @@ Key_performer::try_music (Music* req)
   return false;
 }
 
-ENTER_DESCRIPTION(Key_performer,
+ENTER_DESCRIPTION (Key_performer,
 		  "","",
 		  "key-change-event",
 		  "","","");