X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=c9ced39f6ab631d1d43891859a55ed880d1e1cf7;hb=ed2f7473be57e99f15acc48c06fe18fed27d43b3;hp=50a352bed115203f2d057bc407dacc8f2b7623a9;hpb=e5bf0902bb311efd05f39ce2a11776867631c0db;p=lilypond.git diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 50a352bed1..c9ced39f6a 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -45,9 +45,7 @@ Key_performer::create_audio_elements () if (key_req_) { SCM pitchlist = key_req_->get_property ("pitch-alist"); - static SCM proc; - if (!proc) - proc = scm_primitive_eval (ly_symbol2scm ("alterations-in-key")); + SCM proc = ly_scheme_function ("alterations-in-key"); SCM acc = gh_call1 (proc, pitchlist); @@ -63,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));