* lily/ledger-line-spanner.cc (print): swap linear_combination

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 583c59a936d5f4fe36808cbd6e1958e247f590dc..f93defe07cf2751623b284e0e2b1e7b28d092462 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,71 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer-group-performer.hh"
+#include "context.hh"
+#include "audio-element.hh"
+#include "warn.hh"
 
-#include "debug.hh"
 
+ENTER_DESCRIPTION (Performer_group_performer,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");
 
-ADD_THIS_TRANSLATOR(Performer_group_performer);
 
 
 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 ()
 {
-   for (Cons<Translator> *p = trans_p_list_.head_; p; p = p->next_)
+  for (int j =0; j < announce_infos_.size (); j++)
     {
-      if (Performer_group_performer *trg =  dynamic_cast <Performer_group_performer *> (p->car_))
-       trg->do_announces ();
-    }
-
-  
-  Request dummy_req;
+      Audio_element_info info = announce_infos_[j];
 
-  while (announce_info_arr_.size ())
-    {
-      for (int j =0; j < announce_info_arr_.size(); j++)
+      for (SCM p = get_simple_trans_list (); scm_is_pair (p); p = scm_cdr (p))
        {
-         Audio_element_info info = announce_info_arr_[j];
-         
-         if (!info.req_l_)
-           info.req_l_ = &dummy_req;
+         Translator * t = unsmob_translator (scm_car (p));
+         Performer * eng = dynamic_cast<Performer*> (t);
+         if (eng && eng!= info.origin_trans_)
+           eng->acknowledge_audio_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 ();
-      
+void
+Performer_group_performer::do_announces ()
+{
+  while (1)
+    {
+      create_audio_elements ();
+      performer_each (get_simple_trans_list (),
+                     &Performer::create_audio_elements);
+  
+      if (!announce_infos_.size ())
+       break ;
       
-         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 ();
-               }
-           }
-       }
+      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) ();
+    }
+}