patch::: 1.3.136.jcn3

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 5254c2e15e5940c14f0e318964e4e33d16557005..3b5ea7f6a30d11107ed2112763254b458c736b12 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -13,7 +13,7 @@
 #include "debug.hh"
 
 
-ADD_THIS_TRANSLATOR(Performer_group_performer);
+ADD_THIS_TRANSLATOR (Performer_group_performer);
 
 
 void
@@ -26,21 +26,21 @@ Performer_group_performer::announce_element (Audio_element_info info)
 
 
 void
-Performer_group_performer::process_acknowledged ()
+Performer_group_performer::create_audio_elements ()
 {
-  for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr ( p))
+  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 ();
+       eng->create_audio_elements ();
     }
 }
 
 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_info_arr_.size (); j++)
     {
       Audio_element_info info = announce_info_arr_[j];
 
@@ -49,30 +49,28 @@ Performer_group_performer::acknowledge_elements ()
          Translator * t = unsmob_translator (gh_car (p));
          Performer * eng = dynamic_cast<Performer*> (t);
          if (eng && eng!= info.origin_trans_l_)
-           eng->acknowledge_element (info);
+           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))
+  for (SCM p = trans_group_list_; gh_pair_p (p); p =gh_cdr (p))
     {
       Translator * t = unsmob_translator (gh_car (p));
       dynamic_cast<Performer_group_performer*> (t)->do_announces ();
     }
 
   
-  process_acknowledged ();
+  create_audio_elements ();
     
-  // debug
-  int i = 0;
-  while (announce_info_arr_.size () && i++ < 5)
+  while (announce_info_arr_.size ())
     {
-      acknowledge_elements ();
+      acknowledge_audio_elements ();
       announce_info_arr_.clear ();
-      process_acknowledged ();
+      create_audio_elements ();
     }
 
   if (announce_info_arr_.size ())