X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformer.hh;h=c8b0de3e3767d907931aa56167de31ba1fa17d1c;hb=1e0b328b0eaf62dc57c6f60463864f2e5cb0e659;hp=92b2d77be05a238e7923f8100ccaedcb4fdf6aaa;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 92b2d77be0..c8b0de3e37 100644
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,33 +1,38 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef PERFORMER_HH
 #define PERFORMER_HH
 
-#include "lily-proto.hh"
+#include "audio-element-info.hh"
 #include "array.hh"
 #include "request.hh"
-#include "score-element-info.hh"
-#include "staff-info.hh"
+#include "grob-info.hh"
 #include "translator.hh"
 
 /**
   Convert a music definition into a audio representation.
   A baseclass
  */
-class Performer : public virtual Translator{
+class Performer : public virtual Translator
+{
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Performer_group_performer* daddy_perf_l() const;
+  VIRTUAL_COPY_CONS (Translator);
+  friend class Performer_group_performer;  
+  Performer_group_performer* daddy_perf_l () const;
+
 protected:
-  virtual int get_tempo_i() const;
-  virtual void play (Audio_element * elem_p );
+  virtual void announce_element (Audio_element_info);
+  virtual void acknowledge_audio_element (Audio_element_info);
+  virtual void create_audio_elements ();
+  virtual int get_tempo_i () const;
+  virtual void play_element (Audio_element * elem_p );
 };
 
 
 #endif // PERFORMER_HH
+