(DECLARE_EVENT_SWALLOWER): ENTER_DESCRIPTION -> ADD_TRANSLATOR

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index bc0d86f7d6b52eda706cb1270f335a67971d76f9..ffc0cb7358788eb368e008b91d8a8e6ac5ae7ddb 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, "", "",
                   "",
                   "", "", "");
 
@@ -65,7 +64,7 @@ Staff_performer::initialize ()
   audio_staff_ = new Audio_staff;
   announce_element (Audio_element_info (audio_staff_, 0));
 
-  name_ = new Audio_text (Audio_text::TRACK_NAME, daddy_context_->id_string_);
+  name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
   announce_element (Audio_element_info (name_, 0));
 
   tempo_ = new Audio_tempo (get_tempo ());
@@ -99,7 +98,7 @@ Staff_performer::stop_translation_timestep ()
 {
   SCM proc = ly_scheme_function ("percussion?");
   
-  SCM drums = gh_call1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
+  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
   audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
   if (name_)
     {
@@ -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 (!gh_string_p (minstr)
+  if (!scm_is_string (minstr)
       || ly_scm2string (minstr) == instrument_string_)
     return "";