Nitpick run.

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

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 6a028a6f679daf41459158c4621adec8d8fda03f..a7e51ea6293146cb65999bd10b24854f5d69149c 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-#include "translator-group.hh"
 #include "warn.hh"
 #include "audio-column.hh"
 #include "audio-item.hh"
@@ -15,10 +14,9 @@
 #include "context.hh"
 
 /** Perform a staff. Individual notes should have their instrument
- (staff-wide) set, so we override play_element ()
-
-  */
-class Staff_performer : public Performer_group_performer 
+    (staff-wide) set, so we override play_element ()
+*/
+class Staff_performer : public Performer
 {
 public:
   TRANSLATOR_DECLARATIONS (Staff_performer);
@@ -28,23 +26,25 @@ public:
   String instrument_string_;
 
 protected:
-  virtual void play_element (Audio_element* p);
+  virtual void acknowledge_audio_element (Audio_element *p);
   virtual void finalize ();
   virtual void initialize ();
   virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
 
 private:
-  Audio_staff* audio_staff_;
-  Audio_instrument* instrument_;
-  Audio_text* instrument_name_;
-  Audio_text* name_;
-  Audio_tempo* tempo_;
+  Audio_staff *audio_staff_;
+  Audio_instrument *instrument_;
+  Audio_text *instrument_name_;
+  Audio_text *name_;
+  Audio_tempo *tempo_;
 };
 
-ENTER_DESCRIPTION (Staff_performer, "", "",
-                  "",
-                  "", "", "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Staff_performer, "", "",
+               "",
+               "", "");
 
 Staff_performer::Staff_performer ()
 {
@@ -70,8 +70,6 @@ Staff_performer::initialize ()
 
   tempo_ = new Audio_tempo (get_tempo ());
   announce_element (Audio_element_info (tempo_, 0));
-
-  Performer_group_performer::initialize ();
 }
 
 void
@@ -87,20 +85,19 @@ Staff_performer::create_audio_elements ()
 
       /*
        Have to be here before notes arrive into the staff.
-       */
+      */
       play_element (instrument_);
       play_element (instrument_name_);
     }
-  Performer_group_performer::create_audio_elements ();
 }
 
 void
 Staff_performer::stop_translation_timestep ()
 {
-  SCM proc = ly_scheme_function ("percussion?");
-  
+  SCM proc = ly_lily_module_constant ("percussion?");
+
   SCM drums = scm_call_1 (proc, ly_symbol2scm (instrument_string_.to_str0 ()));
-  audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1 );
+  audio_staff_->channel_ = (drums == SCM_BOOL_T ? 9 : -1);
   if (name_)
     {
       play_element (name_);
@@ -113,20 +110,18 @@ Staff_performer::stop_translation_timestep ()
     }
   instrument_name_ = 0;
   instrument_ = 0;
-  Performer_group_performer::stop_translation_timestep ();
 }
 
 void
 Staff_performer::finalize ()
 {
-  Performer_group_performer::finalize ();
   Performer::play_element (audio_staff_);
   audio_staff_ = 0;
 }
 
-String 
-Staff_performer::new_instrument_string () 
-{ 
+String
+Staff_performer::new_instrument_string ()
+{
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property ("midiInstrument");
 
@@ -139,13 +134,10 @@ Staff_performer::new_instrument_string ()
   return instrument_string_;
 }
 
-void 
-Staff_performer::play_element (Audio_element* p)
+void
+Staff_performer::acknowledge_audio_element (Audio_element *p)
 {
-  if (Audio_item *ai = dynamic_cast<Audio_item *> (p)) 
-    {
-      audio_staff_->add_audio_item (ai);
-    }
-  Performer::play_element (p);
+  if (Audio_item *ai = dynamic_cast<Audio_item *> (p))
+    audio_staff_->add_audio_item (ai);
 }