release: 1.1.46

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

diff --git a/lily/include/performer.hh b/lily/include/performer.hh
index eda9b784f39fa3d460b18dc7020fc7cd9aa5750d..03fea2f25963cb990cd4ddb4d018c6635ff7d2b4 100644 (file)
--- a/lily/include/performer.hh
+++ b/lily/include/performer.hh
@@ -1,58 +1,37 @@
 /*
   performer.hh -- declare Performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (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 "varray.hh"
+#include "audio-element-info.hh"
+#include "array.hh"
 #include "request.hh"
-#include "score-elem-info.hh"
+#include "score-element-info.hh"
 #include "staff-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 void set( Moment mom );
-    // <ugh>
-    virtual void set_track( int& track_i_r );
-    virtual int get_track_i() const;
-    // </ugh>
-
-    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* daddy_perf_l() 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 Moment get_mom() const;
-    virtual void play( Audio_item* p );
-    virtual void play( Midi_item* l );
+  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 );
 };
 
-#include "global-performers.hh"
 
 #endif // PERFORMER_HH
+