X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstaff-performer.cc;h=7c982d05465939782c325c1dda8cc650a0173102;hb=f246d4ebb4d5d60a7143e3a1705ca720a24a1e7d;hp=3e04c006bf84d39e4088029e1e0e94903e39c43f;hpb=59700179aab82bb3d87b526e5fdc43fad3029725;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 3e04c006bf..7c982d0546 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "warn.hh"
@@ -22,8 +22,8 @@ public:
   TRANSLATOR_DECLARATIONS (Staff_performer);
   ~Staff_performer ();
 
-  String new_instrument_string ();
-  String instrument_string_;
+  string new_instrument_string ();
+  string instrument_string_;
 
 protected:
   virtual void acknowledge_audio_element (Audio_element_info info);
@@ -43,7 +43,6 @@ private:
 #include "translator.icc"
 
 ADD_TRANSLATOR (Staff_performer, "", "",
-		"",
 		"", "");
 
 Staff_performer::Staff_performer ()
@@ -64,20 +63,17 @@ Staff_performer::initialize ()
 {
   audio_staff_ = new Audio_staff;
   name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
-  tempo_ = new Audio_tempo (get_tempo ());
 
   audio_staff_->add_audio_item (name_);
-  audio_staff_->add_audio_item (tempo_);
   
   announce_element (Audio_element_info (audio_staff_, 0));
   announce_element (Audio_element_info (name_, 0));
-  announce_element (Audio_element_info (tempo_, 0));
 }
 
 void
 Staff_performer::process_music ()
 {
-  String str = new_instrument_string ();
+  string str = new_instrument_string ();
   if (str.length ())
     {
       instrument_name_ = new Audio_text (Audio_text::INSTRUMENT_NAME, str);
@@ -91,8 +87,6 @@ Staff_performer::process_music ()
       /*
 	Have to be here before notes arrive into the staff.
       */
-      play_element (instrument_);
-      play_element (instrument_name_);
     }
 }
 
@@ -101,16 +95,14 @@ Staff_performer::stop_translation_timestep ()
 {
   SCM proc = ly_lily_module_constant ("percussion?");
 
-  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
+  SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.c_str ()));
   audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1);
   if (name_)
     {
-      play_element (name_);
       name_ = 0;
     }
   if (tempo_)
     {
-      play_element (tempo_);
       tempo_ = 0;
     }
   instrument_name_ = 0;
@@ -120,11 +112,10 @@ Staff_performer::stop_translation_timestep ()
 void
 Staff_performer::finalize ()
 {
-  Performer::play_element (audio_staff_);
   audio_staff_ = 0;
 }
 
-String
+string
 Staff_performer::new_instrument_string ()
 {
   // mustn't ask Score for instrument: it will return piano!