X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformer.hh;h=3e7af707102fc26e9697c7f5940d1510f5e9e804;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0126c7b231d7c3bd4db3d364dd2da06f4b06cc28;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index 0126c7b231..3e7af70710 100644
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,48 +1,31 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.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 "grob-info.hh"
+#include "translator.hh"
 
-/**
-  Convert a music definition into a audio representation.
-  A baseclass
- */
-class Performer {
-    bool init_b_;
+/* Convert a music definition into a audio representation.
+   A baseclass.  */
+class Performer : public 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_CONSTRUCTOR (Translator, Performer);
+  friend class Performer_group;
+  Performer_group *get_daddy_performer () 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 ();
 };
 
-#include "global-performers.hh"
+#endif /* PERFORMER_HH */
 
-#endif // PERFORMER_HH