X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer-group-performer.cc;h=b8f4349ef8df3b374625b587d4e3ad3862592323;hb=6f5b694886301a2facf7293d9f70cf41232103a6;hp=96e25b97d8755e25fd0da72cf1ab606a753d63f1;hpb=38cfe900a3ecf91e35e1b1714a7155270538013f;p=lilypond.git

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 96e25b97d8..b8f4349ef8 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,23 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
                Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "performer-group-performer.hh"
 
 #include "audio-element.hh"
-#include "debug.hh"
+#include "warn.hh"
 
 
-ADD_THIS_TRANSLATOR (Performer_group_performer);
+ENTER_DESCRIPTION(Performer_group_performer,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");
+
 
 
 void
 Performer_group_performer::announce_element (Audio_element_info info)
 {
-  announce_info_arr_.push (info);
+  announce_infos_.push (info);
   Performer::announce_element (info);
 }
 
@@ -28,9 +35,9 @@ Performer_group_performer::announce_element (Audio_element_info info)
 void
 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 = ly_cdr (p))
     {
-      Translator * t = unsmob_translator (gh_car (p));
+      Translator * t = unsmob_translator (ly_car (p));
       Performer * eng = dynamic_cast<Performer*> (t);
       if (eng)
 	eng->create_audio_elements ();
@@ -40,15 +47,15 @@ Performer_group_performer::create_audio_elements ()
 void
 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 = simple_trans_list_; gh_pair_p (p); p = ly_cdr (p))
 	{
-	  Translator * t = unsmob_translator (gh_car (p));
+	  Translator * t = unsmob_translator (ly_car (p));
 	  Performer * eng = dynamic_cast<Performer*> (t);
-	  if (eng && eng!= info.origin_trans_l_)
+	  if (eng && eng!= info.origin_trans_)
 	    eng->acknowledge_audio_element (info);
 	}
     }
@@ -57,28 +64,30 @@ Performer_group_performer::acknowledge_audio_elements ()
 void
 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 =ly_cdr (p))
     {
-      Translator * t = unsmob_translator (gh_car (p));
+      Translator * t = unsmob_translator (ly_car (p));
       dynamic_cast<Performer_group_performer*> (t)->do_announces ();
     }
 
   
   create_audio_elements ();
     
-  while (announce_info_arr_.size ())
+  while (announce_infos_.size ())
     {
       acknowledge_audio_elements ();
-      announce_info_arr_.clear ();
+      announce_infos_.clear ();
       create_audio_elements ();
     }
 
-  if (announce_info_arr_.size ())
+  if (announce_infos_.size ())
     {
 #if 0  //printf?  -> include <stdio.h>     
       printf ("do_announces: elt: %s\n",
-	      classname (announce_info_arr_[0].elem_l_));
+	      classname (announce_infos_[0].elem_));
 #endif      
-      announce_info_arr_.clear ();
+      announce_infos_.clear ();
     }
 }
+
+Performer_group_performer::Performer_group_performer(){}