* lily/include/lily-guile-macros.hh: new file.

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 7cb78b53805d1130416618d2e26ee6707efac537..ee168faa824cb99f45b24378d87ac1ab08250684 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -6,7 +6,6 @@
   (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
-#include "translator-group.hh"
 #include "warn.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
@@ -42,7 +41,7 @@ private:
   Audio_tempo* tempo_;
 };
 
-ENTER_DESCRIPTION (Staff_performer, "", "",
+ADD_TRANSLATOR (Staff_performer, "", "",
                   "",
                   "", "", "");
 
@@ -97,7 +96,7 @@ Staff_performer::create_audio_elements ()
 void
 Staff_performer::stop_translation_timestep ()
 {
-  SCM proc = ly_scheme_function ("percussion?");
+  SCM proc = ly_lily_module_constant ("percussion?");
   
   SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
   audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
@@ -130,7 +129,7 @@ Staff_performer::new_instrument_string ()
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property ("midiInstrument");
 
-  if (!ly_c_string_p (minstr)
+  if (!scm_is_string (minstr)
       || ly_scm2string (minstr) == instrument_string_)
     return "";