* lily/moment.cc (robust_scm2moment): new function.

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 4b7f244532643eabd6e25e219fa85426f4c85926..6a028a6f679daf41459158c4621adec8d8fda03f 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -65,7 +65,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 ());
@@ -130,7 +130,7 @@ Staff_performer::new_instrument_string ()
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property ("midiInstrument");
 
-  if (!ly_string_p (minstr)
+  if (!scm_is_string (minstr)
       || ly_scm2string (minstr) == instrument_string_)
     return "";