X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer-group-performer.cc;h=a49cffbbbd5efbb55c119ba3112addec5a9d81fb;hb=98ba77f9a972c75e431f29a47df18676c3d65621;hp=6844cce7a6a766437d7917b893585be7bb446c8e;hpb=79d510aebf1d131d3023a2a8639b98236cefb8f2;p=lilypond.git

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 6844cce7a6..a49cffbbbd 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -8,12 +8,12 @@
  */
 
 #include "performer-group-performer.hh"
+
 #include "context.hh"
 #include "audio-element.hh"
 #include "warn.hh"
 
-
-ENTER_DESCRIPTION(Performer_group_performer,
+ADD_TRANSLATOR (Performer_group_performer,
 /* descr */       "",
 /* creats*/       "",
 /* accepts */     "",
@@ -28,7 +28,7 @@ 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))
     eg->announce_element (info);
@@ -37,13 +37,13 @@ Performer_group_performer::announce_element (Audio_element_info 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));
+	  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,6 +56,7 @@ Performer_group_performer::do_announces ()
 {
   while (1)
     {
+      create_audio_elements ();
       performer_each (get_simple_trans_list (),
 		      &Performer::create_audio_elements);
   
@@ -67,7 +68,7 @@ Performer_group_performer::do_announces ()
     }
 }
 
-Performer_group_performer::Performer_group_performer()
+Performer_group_performer::Performer_group_performer ()
 {
 }
 
@@ -75,9 +76,9 @@ 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) ();
     }