* lily/spacing-engraver.cc (finalize): robustifications.

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 6e4f5562b9afd343ca13d24977d6be25790ebfa9..74edd0236b5fa1646d1285a58eccdfef9b27a34e 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,68 +3,91 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2003 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 "audio-element.hh"
+#include "warn.hh"
+
+
+ENTER_DESCRIPTION(Performer_group_performer,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");
+
+
 
 void
 Performer_group_performer::announce_element (Audio_element_info info)
 {
-  announce_info_arr_.push (info);
+  announce_infos_.push (info);
   Performer::announce_element (info);
 }
 
+
+
 void
-Performer_group_performer::do_announces()
+Performer_group_performer::create_audio_elements ()
 {
-   for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+  for (SCM p = get_simple_trans_list (); gh_pair_p (p); p = ly_cdr (p))
     {
-      if (Performer_group_performer *trg =  dynamic_cast <Performer_group_performer *> (p->car_))
-       trg->do_announces ();
+      Translator * t = unsmob_translator (ly_car (p));
+      Performer * eng = dynamic_cast<Performer*> (t);
+      if (eng)
+       eng->create_audio_elements ();
     }
+}
 
-  
-  Request dummy_req;
-
-  while (announce_info_arr_.size ())
+void
+Performer_group_performer::acknowledge_audio_elements ()
+{
+  for (int j =0; j < announce_infos_.size (); j++)
     {
-      for (int j =0; j < announce_info_arr_.size(); j++)
+      Audio_element_info info = announce_infos_[j];
+
+      for (SCM p = get_simple_trans_list (); gh_pair_p (p); p = ly_cdr (p))
        {
-         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 ();
-               }
-           }
+         Translator * t = unsmob_translator (ly_car (p));
+         Performer * eng = dynamic_cast<Performer*> (t);
+         if (eng && eng!= info.origin_trans_)
+           eng->acknowledge_audio_element (info);
        }
     }
 }
 
+void
+Performer_group_performer::do_announces ()
+{
+  for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p))
+    {
+      Translator * t = unsmob_translator (ly_car (p));
+      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
+    }
+
+  
+  create_audio_elements ();
+    
+  while (announce_infos_.size ())
+    {
+      acknowledge_audio_elements ();
+      announce_infos_.clear ();
+      create_audio_elements ();
+    }
+
+  if (announce_infos_.size ())
+    {
+#if 0  //printf?  -> include <stdio.h>     
+      printf ("do_announces: elt: %s\n",
+             classname (announce_infos_[0].elem_));
+#endif      
+      announce_infos_.clear ();
+    }
+}
+
+Performer_group_performer::Performer_group_performer(){}