* mf/GNUmakefile: always trace pfa fonts.

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index d8cad9bf98f8c3ea02955bf8be5a521406daa1a2..1c7d5c0b0548e3dc66e0822461f22ce7cf221496 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -94,7 +94,11 @@ Staff_performer::stop_translation_timestep ()
     UGH. -> don't use eval.
   */
   
-  SCM proc = scm_primitive_eval (ly_symbol2scm ("percussion?")); 
+  static SCM proc;
+
+  if (!proc)
+    proc = scm_primitive_eval (ly_symbol2scm ("percussion?"));
+  
   SCM drums = gh_call1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
   audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
   if (name_)
@@ -134,9 +138,6 @@ Staff_performer::new_instrument_string ()
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property ("midiInstrument");
 
-  if (!gh_string_p (minstr))
-    minstr = get_property ("instrument");
-
   if (!gh_string_p (minstr)
       || ly_scm2string (minstr) == instrument_string_)
     return "";