patch::: 1.3.33.jcn3

[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 e06dd3b017864370a9a91c253a62df7621fc0a18..9764275cc186d075d42375cf5230bdd587864878 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef PERFORMER_GROUP_PERFORMER_HH
@@ -10,46 +10,21 @@
 
 #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_;
-
-    virtual void add (Performer* perf_p);
-    virtual bool do_try_request (Request* req_l);
-    virtual void print() const;
-    virtual bool try_request (Request* r);
-    
+  VIRTUAL_COPY_CONS(Translator);
 
+  virtual void do_announces();
+  virtual void announce_element (Audio_element_info);
 protected:
-    virtual ~Performer_group_performer();
-    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;
-
-private:
-    Pointer_list<Performer*> perf_p_list_;
-    
-    Link_array<Performer_group_performer> group_l_arr_;
-    Link_array<Performer> nongroup_l_arr_;
+  Array<Audio_element_info> announce_info_arr_;
 };
 
 #endif // PERFORMER_GROUP_PERFORMER_HH