* 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 56d31210b110cf79ae9aeb0ccebc15ea6265e6f5..1c7d5c0b0548e3dc66e0822461f22ce7cf221496 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "translator-group.hh"
@@ -41,7 +41,9 @@ private:
   Audio_tempo* tempo_;
 };
 
-ENTER_DESCRIPTION (Staff_performer, "","","","","" );
+ENTER_DESCRIPTION (Staff_performer, "", "",
+                  "",
+                  "", "", "");
 
 Staff_performer::Staff_performer ()
 {
@@ -88,7 +90,15 @@ Staff_performer::create_audio_elements ()
 void
 Staff_performer::stop_translation_timestep ()
 {
-  SCM proc = scm_primitive_eval (ly_symbol2scm ("percussion-p")); 
+  /*
+    UGH. -> don't use eval.
+  */
+  
+  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_)
@@ -128,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 "";