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 9161c6322434d1db3de354d81ae0ea1d3d20b981..12abd08cfbff14a6e8dd9df91c19936d64f68d4f 100644 (file)
--- a/lily/include/staff-performer.hh
+++ b/lily/include/staff-performer.hh
@@ -1,8 +1,8 @@
 /*
   staff-performer.hh -- declare Staff_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef STAFF_PERFORMER_HH
@@ -10,26 +10,35 @@
 
 #include "performer-group-performer.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 
 {
 public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS(Translator);
+  
 
-    Staff_performer();
-    ~Staff_performer();
+  Staff_performer ();
+  ~Staff_performer ();
 
-    String instrument_str();
+  String new_instrument_str ();
+  String instrument_str_;
 
 protected:
-    virtual void play_event( Midi_item* l );
-    virtual void do_removal_processing();
-    virtual void do_creation_processing();
+  virtual void play_element (Audio_element* p);
+  virtual void do_removal_processing ();
+  virtual void do_creation_processing ();
+  virtual void do_process_music ();
+  virtual void do_pre_move_processing ();
 
 private:
-    void header();
-
-    Moment midi_mom_;
-    Midi_track* midi_track_p_;
+  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