release: 1.3.33

[lilypond.git] / lily / include / staff-performer.hh

diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh
index 484ae5bafab705d47bf8c1fb39c4155849d103d3..12abd08cfbff14a6e8dd9df91c19936d64f68d4f 100644 (file)
--- a/lily/include/staff-performer.hh
+++ b/lily/include/staff-performer.hh
@@ -1,7 +1,7 @@
 /*
   staff-performer.hh -- declare Staff_performer
 
-  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -11,14 +11,14 @@
 #include "performer-group-performer.hh"
 
 /** Perform a staff. Individual notes should have their instrument
-  (staff-wide) set, so we override play()
+  (staff-wide) set, so we override play_element()
 
   */
 class Staff_performer : public Performer_group_performer 
 {
 public:
-  TRANSLATOR_CLONE(Staff_performer);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS(Translator);
+  
 
   Staff_performer ();
   ~Staff_performer ();
@@ -27,13 +27,18 @@ public:
   String instrument_str_;
 
 protected:
-  virtual void play (Audio_element* p);
+  virtual void play_element (Audio_element* p);
   virtual void do_removal_processing ();
   virtual void do_creation_processing ();
-  virtual void do_process_requests ();
+  virtual void do_process_music ();
+  virtual void do_pre_move_processing ();
 
 private:
   Audio_staff* audio_staff_p_;
+  Audio_instrument* instrument_p_;
+  Audio_text* instrument_name_p_;
+  Audio_text* name_p_;
+  Audio_tempo* tempo_p_;
 };
 
 #endif // STAFF_PERFORMER_HH