* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index c13d65505c58a6f8d780d4743332ca353306c73f..7319dd92233f097383bbd45f361bc00782db7854 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,52 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 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"
+
 
+ENTER_DESCRIPTION (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
+    = get_parent_context ()->get_parent_context ()->implementation ();
 
-
-
-void
-Performer_group_performer::create_audio_elements ()
-{
-  for (SCM p = simple_trans_list_; gh_pair_p (p); p = ly_cdr (p))
-    {
-      Translator * t = unsmob_translator (ly_car (p));
-      Performer * eng = dynamic_cast<Performer*> (t);
-      if (eng)
-       eng->create_audio_elements ();
-    }
+  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_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 = ly_cdr (p))
+      for (SCM p = get_simple_trans_list (); ly_c_pair_p (p); p = ly_cdr (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 +54,32 @@ Performer_group_performer::acknowledge_audio_elements ()
 void
 Performer_group_performer::do_announces ()
 {
-  for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p))
+  while (1)
     {
-      Translator * t = unsmob_translator (ly_car (p));
-      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
-    }
-
+      create_audio_elements ();
+      performer_each (get_simple_trans_list (),
+                     &Performer::create_audio_elements);
   
-  create_audio_elements ();
-    
-  while (announce_info_arr_.size ())
-    {
+      if (!announce_infos_.size ())
+       break ;
+      
       acknowledge_audio_elements ();
-      announce_info_arr_.clear ();
-      create_audio_elements ();
+      announce_infos_.clear ();
     }
+}
+
+Performer_group_performer::Performer_group_performer ()
+{
+}
+
 
-  if (announce_info_arr_.size ())
+void
+performer_each (SCM list, Performer_method method)
+{
+  for (SCM p = list; ly_c_pair_p (p); p = ly_cdr (p))
     {
-#if 0  //printf?  -> include <stdio.h>     
-      printf ("do_announces: elt: %s\n",
-             classname (announce_info_arr_[0].elem_l_));
-#endif      
-      announce_info_arr_.clear ();
+      Performer * e = dynamic_cast<Performer*>(unsmob_translator (ly_car (p)));
+      if (e)
+       (e->*method) ();
     }
 }