* lily/page-turn-engraver.cc (breakable_column): remove an always-true

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 77770cab3cc3c47f3f1095f2aff6c177e32a7144..c73ab6eb81e322bb6a3747b1f97bb69399c8be3c 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -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);
@@ -64,20 +64,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 +88,6 @@ Staff_performer::process_music ()
       /*
        Have to be here before notes arrive into the staff.
       */
-      play_element (instrument_);
-      play_element (instrument_name_);
     }
 }
 
@@ -105,12 +100,10 @@ Staff_performer::stop_translation_timestep ()
   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 +113,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!