2003 -> 2004

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

diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh
index fdca52a576725745d6a4dca6f1348806921c1a4b..0bf2ae4e2dede0df56b3f29fa0933586472d9b59 100644 (file)
--- a/lily/include/performer-group-performer.hh
+++ b/lily/include/performer-group-performer.hh
@@ -1,8 +1,8 @@
 /*
   performer-group-performer.hh -- declare Performer_group_performer
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-                 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef PERFORMER_GROUP_PERFORMER_HH
@@ -10,54 +10,25 @@
 
 #include "lily-proto.hh"
 #include "parray.hh"
-#include "plist.hh"
 #include "performer.hh"
-#include "translator.hh"
+#include "translator-group.hh"
 
 /**
   Group a number of performers. Usually delegates everything to its contents.
 */
 
-class Performer_group_performer : public Performer, public virtual Translator {
+class Performer_group_performer : public Performer, public virtual Translator_group {
 public:
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Input_translator* itrans_l_;
-
-    Performer_group_performer();
-    ~Performer_group_performer();
-
-    virtual void add( Performer* perf_p );
-    virtual void print()const { Performer::print() ; }
-    virtual Moment get_mom() const;
-    virtual bool do_try_request( Request* req_l );
-    virtual bool try_request(Request*r) { return Performer::try_request(r) ; }
-
-    // <ugh>
-    virtual void set_track( int& track_i_r );
-    virtual int get_track_i() const;
-    // </ugh>
-
+  TRANSLATOR_DECLARATIONS(Performer_group_performer);
+  
+  virtual void do_announces ();
+  virtual void announce_element (Audio_element_info);
 protected:
-
-    virtual Translator* find_get_translator_l( String name, String id );
-    virtual Translator* get_default_interpreter();
-
-    Translator * ancestor_l( int l = 1 );
-    virtual int depth_i() const;
-
-    virtual void process_requests();
-    virtual void do_removal_processing();
-    virtual void do_creation_processing();
-
-    bool is_bottom_performer_b() const;
-    virtual Performer_group_performer* find_performer_l( String name, String id );
-    virtual void do_print()const;
+  Array<Audio_element_info> announce_infos_;
+  void create_audio_elements ();
 
 private:
-    Pointer_list<Performer*> perf_p_list_;
-    
-    Link_array<Performer_group_performer> group_l_arr_;
-    Link_array<Performer> nongroup_l_arr_;
+  void acknowledge_audio_elements ();
 };
 
 #endif // PERFORMER_GROUP_PERFORMER_HH