patch::: 1.3.115.jcn2

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 583c59a936d5f4fe36808cbd6e1958e247f590dc..8952105656b8a8a759d7c5aecd5682fe92e5d60e 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer-group-performer.hh"
 
+#include "audio-element.hh"
 #include "debug.hh"
 
 
@@ -22,52 +23,68 @@ Performer_group_performer::announce_element (Audio_element_info info)
   Performer::announce_element (info);
 }
 
+
+
+void
+Performer_group_performer::create_grobs ()
+{
+  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->create_grobs ();
+    }
+}
+
+void
+Performer_group_performer::acknowledge_grobs ()
+{
+  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!= info.origin_trans_l_)
+           eng->acknowledge_grob (info);
+       }
+    }
+}
+
 void
 Performer_group_performer::do_announces()
 {
-   for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+  for (SCM p = trans_group_list_; gh_pair_p (p); p =gh_cdr ( p))
     {
-      if (Performer_group_performer *trg =  dynamic_cast <Performer_group_performer *> (p->car_))
-       trg->do_announces ();
+      Translator * t = unsmob_translator (gh_car (p));
+      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
     }
 
   
-  Request dummy_req;
+  create_grobs ();
+    
+  // debug
+  int i = 0;
+  while (announce_info_arr_.size () && i++ < 5)
+    {
+      acknowledge_grobs ();
+      announce_info_arr_.clear ();
+      create_grobs ();
+    }
 
-  while (announce_info_arr_.size ())
+  if (announce_info_arr_.size ())
     {
-      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 (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 ();
-               }
-           }
-       }
+      printf ("do_announces: elt: %s\n",
+             classname (announce_info_arr_[0].elem_l_));
+      announce_info_arr_.clear ();
     }
 }
 
+
+
+
+
+