X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer-group-performer.cc;h=053a5f32fce04e61dc2fabdeff25d6e3e6ded9fa;hb=5eedf005834d8d3fdc64aee2554a9936c3ef1f57;hp=8a097964307c95506a4b3c7741af0bcefc7553f2;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 8a09796430..053a5f32fc 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,49 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-               Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2005 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"
 
-
-ENTER_DESCRIPTION (Performer_group_performer,
-/* descr */       "",
-/* creats*/       "",
-/* accepts */     "",
-/* acks  */      "",
-/* reads */       "",
-/* write */       "");
-
-
+ADD_TRANSLATOR (Performer_group_performer,
+		/* descr */ "",
+		/* creats*/ "",
+		/* accepts */ "",
+		/* acks  */ "",
+		/* reads */ "",
+		/* write */ "");
 
 void
 Performer_group_performer::announce_element (Audio_element_info info)
 {
   announce_infos_.push (info);
   Translator *t
-    = unsmob_translator (daddy_context_->daddy_context_->implementation_);
+    = context ()->get_parent_context ()->implementation ();
 
-  if (Performer_group_performer * eg = dynamic_cast<Performer_group_performer*> (t))
+  if (Performer_group_performer *eg = dynamic_cast<Performer_group_performer *> (t))
     eg->announce_element (info);
 }
 
 void
 Performer_group_performer::acknowledge_audio_elements ()
 {
-  for (int j =0; j < announce_infos_.size (); j++)
+  for (int j = 0; j < announce_infos_.size (); j++)
     {
       Audio_element_info info = announce_infos_[j];
 
-      for (SCM p = get_simple_trans_list (); gh_pair_p (p); p = ly_cdr (p))
+      for (SCM p = get_simple_trans_list (); scm_is_pair (p); p = scm_cdr (p))
 	{
-	  Translator * t = unsmob_translator (ly_car (p));
-	  Performer * eng = dynamic_cast<Performer*> (t);
-	  if (eng && eng!= info.origin_trans_)
+	  Translator *t = unsmob_translator (scm_car (p));
+	  Performer *eng = dynamic_cast<Performer *> (t);
+	  if (eng && eng != info.origin_trans_)
 	    eng->acknowledge_audio_element (info);
 	}
     }
@@ -56,12 +54,13 @@ 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 ;
-      
+	break;
+
       acknowledge_audio_elements ();
       announce_infos_.clear ();
     }
@@ -71,13 +70,12 @@ Performer_group_performer::Performer_group_performer ()
 {
 }
 
-
 void
 performer_each (SCM list, Performer_method method)
 {
-  for (SCM p = list; gh_pair_p (p); p = ly_cdr (p))
+  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
     {
-      Performer * e = dynamic_cast<Performer*>(unsmob_translator (ly_car (p)));
+      Performer *e = dynamic_cast<Performer *> (unsmob_translator (scm_car (p)));
       if (e)
 	(e->*method) ();
     }