release: 1.3.61

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 547163f457979d3e93ecf56b06ff21602514edcd..bebb642468f2995be851d89733a7c5e935e99d70 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -45,7 +45,7 @@ Staff_performer::do_creation_processing ()
 }
 
 void
-Staff_performer::do_process_requests ()
+Staff_performer::do_process_music ()
 {
   String str = new_instrument_str ();
   if (str.length_i ())
@@ -55,7 +55,7 @@ Staff_performer::do_process_requests ()
       instrument_p_ = new Audio_instrument (str);
       announce_element (Audio_element_info (instrument_p_, 0));
     }
-  Performer_group_performer::do_process_requests ();
+  Performer_group_performer::do_process_music ();
 }
 
 void
@@ -96,10 +96,10 @@ String
 Staff_performer::new_instrument_str () 
 { 
   // mustn't ask Score for instrument: it will return piano!
-  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"), 0);
+  SCM minstr = get_property (ly_symbol2scm ("midiInstrument"));
 
   if (!gh_string_p(minstr))
-    minstr = get_property (ly_symbol2scm ("instrument"), 0);
+    minstr = get_property (ly_symbol2scm ("instrument"));
 
   if (!gh_string_p (minstr)
       || ly_scm2string (minstr) == instrument_str_)