release: 1.5.29

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

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 03fea2f25963cb990cd4ddb4d018c6635ff7d2b4..c3e40c4296379c043a0651b22412087b52cc0e9c 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,7 +1,7 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -11,25 +11,26 @@
 #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);
+  VIRTUAL_COPY_CONS (Translator);
   friend class Performer_group_performer;  
-  Performer_group_performer* daddy_perf_l() const;
+  Performer_group_performer* daddy_perf_l () const;
+
 protected:
   virtual void announce_element (Audio_element_info);
-  virtual void acknowledge_element (Audio_element_info);
-  virtual void process_acknowledged ();
-  virtual int get_tempo_i() const;
-  virtual void play (Audio_element * elem_p );
+  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 );
 };