release: 1.3.13

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index b0278c661d17cc955ba55c49574200fd703acc72..7496881ad0732a1c33f420cd88bc0260379a59e3 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -25,19 +25,15 @@ Performer_group_performer::announce_element (Audio_element_info info)
 void
 Performer_group_performer::do_announces()
 {
-  Link_array<Translator_group> groups = group_l_arr ();
-  for (int i=0; i < groups.size(); i++) 
+   for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
     {
-      Performer_group_performer * group = dynamic_cast<Performer_group_performer*> (groups[i]);
-      if (group)
-       {
-         group->do_announces();
-       }
+      if (Performer_group_performer *trg =  dynamic_cast <Performer_group_performer *> (p->car_))
+       trg->do_announces ();
     }
+
   
   Request dummy_req;
 
-  Link_array<Translator> nongroups = nongroup_l_arr ();
   while (announce_info_arr_.size ())
     {
       for (int j =0; j < announce_info_arr_.size(); j++)
@@ -46,24 +42,32 @@ Performer_group_performer::do_announces()
          
          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]);
-             // urg, huh? core dump?
-             //if (eng && eng!= info.origin_trans_l_arr_[0])
-             if (eng && info.origin_trans_l_arr_.size ()
-                 && eng!= info.origin_trans_l_arr_[0])
-               eng->acknowledge_element (info);
+
+         for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+           {
+             if (!dynamic_cast <Performer_group_performer *> (p->car_))
+               {
+                 Performer * eng = dynamic_cast<Performer*> (p->car_);
+                 // urg, huh? core dump?
+                 //if (eng && eng!= info.origin_trans_l_arr_[0])
+                 if (eng && info.origin_trans_l_arr_.size ()
+                     && eng!= info.origin_trans_l_arr_[0])
+                   eng->acknowledge_element (info);
+               }
+           }
+         announce_info_arr_.clear ();
+      
+      
+         for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+           {
+             if (!dynamic_cast <Performer_group_performer *> (p->car_))
+               {
+                 Performer * eng = dynamic_cast<Performer*> (p->car_);
+                 if (eng)
+                   eng->process_acknowledged ();
+               }
            }
        }
-      announce_info_arr_.clear ();
-      for (int i=0; i < nongroups.size(); i++)
-       {
-         Performer * eng = dynamic_cast<Performer*> (nongroups[i]);
-         if (eng)
-           eng->process_acknowledged ();
-       }
-
     }
 }