release: 1.3.142

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index d594e49b92ef507d6132880beca84586c0635e88..3b5ea7f6a30d11107ed2112763254b458c736b12 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -13,7 +13,7 @@
 #include "debug.hh"
 
 
-ADD_THIS_TRANSLATOR(Performer_group_performer);
+ADD_THIS_TRANSLATOR (Performer_group_performer);
 
 
 void
@@ -26,48 +26,59 @@ Performer_group_performer::announce_element (Audio_element_info info)
 
 
 void
-Performer_group_performer::do_announces()
+Performer_group_performer::create_audio_elements ()
 {
-  for (SCM p = trans_group_list_; gh_pair_p (p); p =gh_cdr ( p))
+  for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
     {
       Translator * t = unsmob_translator (gh_car (p));
-      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
+      Performer * eng = dynamic_cast<Performer*> (t);
+      if (eng)
+       eng->create_audio_elements ();
     }
-  
-  // debug
-  int i = 0;
-  do
-  {
-    i++;
-    for (int j =0; j < announce_info_arr_.size(); j++)
-      {
-       Audio_element_info info = announce_info_arr_[j];
-
-       if (i > 10)
-         {
-           printf ("elt: %s\n",
-                   classname (announce_info_arr_[j].elem_l_));
-           announce_info_arr_.clear ();
-         }
-
-         for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
-           {
-             Translator * t = unsmob_translator (gh_car (p));
-             Performer * eng = dynamic_cast<Performer*> (t);
-             if (eng && eng!= info.origin_trans_l_)
-               eng->acknowledge_element (info);
-           }
-       }
-      announce_info_arr_.clear ();
-      for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr ( p))
+}
+
+void
+Performer_group_performer::acknowledge_audio_elements ()
+{
+  for (int j =0; j < announce_info_arr_.size (); j++)
+    {
+      Audio_element_info info = announce_info_arr_[j];
+
+      for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
        {
          Translator * t = unsmob_translator (gh_car (p));
          Performer * eng = dynamic_cast<Performer*> (t);
-         if (eng)
-           eng->process_acknowledged ();
+         if (eng && eng!= info.origin_trans_l_)
+           eng->acknowledge_audio_element (info);
        }
     }
-  while (announce_info_arr_.size ());
+}
+
+void
+Performer_group_performer::do_announces ()
+{
+  for (SCM p = trans_group_list_; gh_pair_p (p); p =gh_cdr (p))
+    {
+      Translator * t = unsmob_translator (gh_car (p));
+      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
+    }
+
+  
+  create_audio_elements ();
+    
+  while (announce_info_arr_.size ())
+    {
+      acknowledge_audio_elements ();
+      announce_info_arr_.clear ();
+      create_audio_elements ();
+    }
+
+  if (announce_info_arr_.size ())
+    {
+      printf ("do_announces: elt: %s\n",
+             classname (announce_info_arr_[0].elem_l_));
+      announce_info_arr_.clear ();
+    }
 }