Updates.

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index d666fb6064d6fbbf2e333350c0e291ffa436ef1f..b0705a9df7e8ff2146139f08e6c40e73478298b6 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"
@@ -42,7 +42,7 @@ private:
 };
 
 ENTER_DESCRIPTION (Staff_performer, "", "",
-                  "general-music",
+                  "",
                   "", "", "");
 
 Staff_performer::Staff_performer ()
@@ -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_)