Update using bison-CVS.

[lilypond.git] / lily / performer-group-performer.cc

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index c44d68ad7d5bf34cbf865d271b9997462315ef49..053a5f32fce04e61dc2fabdeff25d6e3e6ded9fa 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,64 +3,80 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-               Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer-group-performer.hh"
 
-#include "debug.hh"
-
-
-ADD_THIS_TRANSLATOR(Performer_group_performer);
+#include "context.hh"
+#include "audio-element.hh"
+#include "warn.hh"
 
+ADD_TRANSLATOR (Performer_group_performer,
+               /* descr */ "",
+               /* creats*/ "",
+               /* accepts */ "",
+               /* acks  */ "",
+               /* reads */ "",
+               /* write */ "");
 
 void
 Performer_group_performer::announce_element (Audio_element_info info)
 {
-  announce_info_arr_.push (info);
-  Performer::announce_element (info);
+  announce_infos_.push (info);
+  Translator *t
+    = context ()->get_parent_context ()->implementation ();
+
+  if (Performer_group_performer *eg = dynamic_cast<Performer_group_performer *> (t))
+    eg->announce_element (info);
 }
 
 void
-Performer_group_performer::do_announces()
+Performer_group_performer::acknowledge_audio_elements ()
 {
-  Link_array<Translator_group> groups = group_l_arr ();
-  for (int i=0; i < groups.size(); i++) 
+  for (int j = 0; j < announce_infos_.size (); j++)
     {
-      Performer_group_performer * group = dynamic_cast<Performer_group_performer*> (groups[i]);
-      if (group)
+      Audio_element_info info = announce_infos_[j];
+
+      for (SCM p = get_simple_trans_list (); scm_is_pair (p); p = scm_cdr (p))
        {
-         group->do_announces();
+         Translator *t = unsmob_translator (scm_car (p));
+         Performer *eng = dynamic_cast<Performer *> (t);
+         if (eng && eng != info.origin_trans_)
+           eng->acknowledge_audio_element (info);
        }
     }
-  
-  Request dummy_req;
+}
 
-  Link_array<Translator> nongroups = nongroup_l_arr ();
-  while (announce_info_arr_.size ())
+void
+Performer_group_performer::do_announces ()
+{
+  while (1)
     {
-      for (int j =0; j < announce_info_arr_.size(); j++)
-       {
-         Audio_element_info info = announce_info_arr_[j];
-         
-         if (!info.req_l_)
-           info.req_l_ = &dummy_req;
-         for (int i=0; i < nongroups.size(); i++) 
-           {   // Is this good enough?
-             Performer * eng = dynamic_cast<Performer*> (nongroups[i]);
-             if (eng && eng!= info.origin_trans_l_arr_[0])
-               eng->acknowledge_element (info);
-           }
-       }
-      announce_info_arr_.clear ();
-      for (int i=0; i < nongroups.size(); i++)
-       {
-         Performer * eng = dynamic_cast<Performer*> (nongroups[i]);
-         if (eng)
-           eng->process_acknowledged ();
-       }
+      create_audio_elements ();
+      performer_each (get_simple_trans_list (),
+                     &Performer::create_audio_elements);
+
+      if (!announce_infos_.size ())
+       break;
 
+      acknowledge_audio_elements ();
+      announce_infos_.clear ();
     }
 }
 
+Performer_group_performer::Performer_group_performer ()
+{
+}
+
+void
+performer_each (SCM list, Performer_method method)
+{
+  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
+    {
+      Performer *e = dynamic_cast<Performer *> (unsmob_translator (scm_car (p)));
+      if (e)
+       (e->*method) ();
+    }
+}