* Another grand 2003 update.

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

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 0126c7b231d7c3bd4db3d364dd2da06f4b06cc28..a4a6caff1d9c738b3072bc77d1dcb2323504ec8a 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,48 +1,38 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef PERFORMER_HH
 #define PERFORMER_HH
 
-#include "lily-proto.hh"
-#include "varray.hh"
-#include "request.hh"
-#include "score-elem-info.hh"
-#include "staff-info.hh"
+#include "audio-element-info.hh"
+#include "array.hh"
+#include "event.hh"
+#include "grob-info.hh"
+#include "translator.hh"
 
 /**
   Convert a music definition into a audio representation.
   A baseclass
  */
-class Performer {
-    bool init_b_;
+class Performer : public virtual Translator
+{
 public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Performer_group_performer* daddy_perf_l_;
-
-    Performer();
-    virtual ~Performer();
-
-    void print() const;
-    virtual void process_requests();
-
-    virtual bool try_request( Request* req_l );
-
-    virtual void do_removal_processing();
-    void creation_processing();
+  VIRTUAL_COPY_CONS (Translator);
+  friend class Performer_group_performer;  
+  Performer_group_performer* get_daddy_perf () const;
 
 protected:
-    virtual void do_creation_processing();
-    virtual bool do_try_request(Request*);
-    virtual int get_tempo_i() const;
-    virtual void do_print() 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 () const;
+  virtual void play_element (Audio_element * elem );
 };
 
-#include "global-performers.hh"
 
 #endif // PERFORMER_HH
+