X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer-group-performer.cc;h=a49cffbbbd5efbb55c119ba3112addec5a9d81fb;hb=f817c9010f8016d5e9c19ec3b167e7d485538eb3;hp=5254c2e15e5940c14f0e318964e4e33d16557005;hpb=bd7b422b1796049dee832848f00f9180bcc4bdf6;p=lilypond.git

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 5254c2e15e..a49cffbbbd 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,88 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--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 "debug.hh"
+#include "warn.hh"
 
+ADD_TRANSLATOR (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 ();
 
-void
-Performer_group_performer::process_acknowledged ()
-{
-  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 (Performer_group_performer * eg = dynamic_cast<Performer_group_performer*> (t))
+    eg->announce_element (info);
 }
 
 void
-Performer_group_performer::acknowledge_elements ()
+Performer_group_performer::acknowledge_audio_elements ()
 {
-  for (int j =0; j < announce_info_arr_.size(); j++)
+  for (int j = 0; j < announce_infos_.size (); j++)
     {
-      Audio_element_info info = announce_info_arr_[j];
+      Audio_element_info info = announce_infos_[j];
 
-      for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
+      for (SCM p = get_simple_trans_list (); scm_is_pair (p); p = scm_cdr (p))
 	{
-	  Translator * t = unsmob_translator (gh_car (p));
+	  Translator * t = unsmob_translator (scm_car (p));
 	  Performer * eng = dynamic_cast<Performer*> (t);
-	  if (eng && eng!= info.origin_trans_l_)
-	    eng->acknowledge_element (info);
+	  if (eng && eng!= info.origin_trans_)
+	    eng->acknowledge_audio_element (info);
 	}
     }
 }
 
 void
-Performer_group_performer::do_announces()
+Performer_group_performer::do_announces ()
 {
-  for (SCM p = trans_group_list_; gh_pair_p (p); p =gh_cdr ( p))
+  while (1)
     {
-      Translator * t = unsmob_translator (gh_car (p));
-      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
-    }
-
+      create_audio_elements ();
+      performer_each (get_simple_trans_list (),
+		      &Performer::create_audio_elements);
   
-  process_acknowledged ();
-    
-  // debug
-  int i = 0;
-  while (announce_info_arr_.size () && i++ < 5)
-    {
-      acknowledge_elements ();
-      announce_info_arr_.clear ();
-      process_acknowledged ();
-    }
-
-  if (announce_info_arr_.size ())
-    {
-      printf ("do_announces: elt: %s\n",
-	      classname (announce_info_arr_[0].elem_l_));
-      announce_info_arr_.clear ();
+      if (!announce_infos_.size ())
+	break ;
+      
+      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) ();
+    }
+}