X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-performer.cc;h=0b138701c391d30fb5ac89e63885bcfc4f9e6128;hb=375279298392a64be4f415b058fff88b3523540a;hp=77770cab3cc3c47f3f1095f2aff6c177e32a7144;hpb=8a719f6eec1bd84269a55d1ec99adb3f17c04e64;p=lilypond.git

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 77770cab3c..0b138701c3 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "warn.hh"
@@ -13,8 +13,8 @@
 #include "performer-group.hh"
 #include "context.hh"
 
-/** Perform a staff. Individual notes should have their instrument
-    (staff-wide) set, so we override play_element ()
+/* Perform a staff. Individual notes should have their instrument
+  (staff-wide) set, so we override play_element ()
 */
 class Staff_performer : public Performer
 {
@@ -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);
@@ -42,9 +42,18 @@ private:
 
 #include "translator.icc"
 
-ADD_TRANSLATOR (Staff_performer, "", "",
+ADD_TRANSLATOR (Staff_performer,
+		/* doc */
 		"",
-		"", "");
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		"");
 
 Staff_performer::Staff_performer ()
 {
@@ -64,20 +73,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 +97,6 @@ Staff_performer::process_music ()
       /*
 	Have to be here before notes arrive into the staff.
       */
-      play_element (instrument_);
-      play_element (instrument_name_);
     }
 }
 
@@ -105,12 +109,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 +122,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!