Run `make grand-replace'.

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 54a57b94515fa72d5be2ce7d7e51fcdba307e478..b2565b1913d897b6c26ee02cda7d7744b83f4ae0 100644 (file)
--- 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--2008 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
 {
@@ -42,9 +42,18 @@ private:
 
 #include "translator.icc"
 
-ADD_TRANSLATOR (Staff_performer, "", "",
+ADD_TRANSLATOR (Staff_performer,
+               /* doc */
                "",
-               "", "");
+
+               /* create */
+               "",
+
+               /* read */
+               "",
+
+               /* write */
+               "");
 
 Staff_performer::Staff_performer ()
 {
@@ -65,19 +74,10 @@ Staff_performer::initialize ()
   audio_staff_ = new Audio_staff;
   name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
 
-  Rational r = robust_scm2moment (get_property ("tempoWholesPerMinute"),
-                                 Moment (15,1)).main_part_;
-
-  r *= Rational (4,1);
-  
-  tempo_ = new Audio_tempo (r.to_int ());
-
   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
@@ -97,8 +97,6 @@ Staff_performer::process_music ()
       /*
        Have to be here before notes arrive into the staff.
       */
-      play_element (instrument_);
-      play_element (instrument_name_);
     }
 }
 
@@ -111,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;
@@ -126,7 +122,6 @@ Staff_performer::stop_translation_timestep ()
 void
 Staff_performer::finalize ()
 {
-  Performer::play_element (audio_staff_);
   audio_staff_ = 0;
 }