release: 1.1.29

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

diff --git a/lily/include/staff-performer.hh b/lily/include/staff-performer.hh
index 95c8721da8f69bf927aa040e678d7a22813a9fe7..d9b2471c3e58fdfe060f1b1eaf2d2a8ce8ada08f 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef STAFF_PERFORMER_HH
@@ -10,32 +10,30 @@
 
 #include "performer-group-performer.hh"
 
+/** Perform a staff. Individual notes should have their instrument
+  (staff-wide) set, so we override play()
+
+  */
 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();
-    // <ugh>
-    virtual void set_track( int& track_i_r );
-    virtual int get_track_i() const;
-    // </ugh>
+  virtual void play (Audio_element* p);
+  virtual void do_removal_processing ();
+  virtual void do_creation_processing ();
+  virtual void do_process_requests ();
 
 private:
-    void header();
-
-    Moment midi_mom_;
-    Midi_track* midi_track_p_;
-
-    int track_i_;
+  Audio_staff* audio_staff_p_;
 };
 
 #endif // STAFF_PERFORMER_HH