patch::: 1.3.8.uu1

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

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 61fd1d2aba40890deeb0d39bad10ceb590534192..ce5b71ad518e88687688bf3ff33393bd86c72190 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,14 +1,14 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996,  1997--1999 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"
@@ -19,16 +19,21 @@
   Convert a music definition into a audio representation.
   A baseclass
  */
-class Performer : public virtual Translator{
+class Performer : public virtual Translator
+{
 public:
-  TRANSLATOR_CLONE(Performer);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS(Translator);
+  friend class Performer_group_performer;  
   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 );
-  Performer * access_Performer () { return this; }
+  virtual void play_element (Audio_element * elem_p );
 };
 
 
 #endif // PERFORMER_HH
+