(parse_symbol_list): Bugfix.

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 8d5b6b7f60b841c5d41fe16beb111fdb80931d9e..37715b538e431ee1558df1fd6a99eb062468d651 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -3,90 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 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 "debug.hh"
-
-
-ENTER_DESCRIPTION(Performer_group_performer,
-/* descr */       "",
-/* creats*/       "",
-/* acks  */       "",
-/* reads */       "",
-/* write */       "");
-
+#include "warn.hh"
 
+ADD_TRANSLATOR_GROUP (Performer_group_performer,
+                     /* doc */ "",
+                     /* create */ "",
+                     /* accept */ "",
+                     /* read */ "",
+                     /* write */ "");
 
 void
 Performer_group_performer::announce_element (Audio_element_info info)
 {
-  announce_info_arr_.push (info);
-  Performer::announce_element (info);
-}
+  announce_infos_.push (info);
+  Translator_group *t
+    = 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 (); 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_l_)
+         Translator *t = unsmob_translator (scm_car (p));
+         Performer *eng = dynamic_cast<Performer *> (t);
+         if (eng && eng != info.origin_trans_)
            eng->acknowledge_audio_element (info);
        }
     }
 }
 
 void
-Performer_group_performer::do_announces ()
+performer_each (SCM list, Performer_method method)
 {
-  for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p))
+  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
     {
-      Translator * t = unsmob_translator (ly_car (p));
-      dynamic_cast<Performer_group_performer*> (t)->do_announces ();
+      Performer *e = dynamic_cast<Performer *> (unsmob_translator (scm_car (p)));
+      if (e)
+       (e->*method) ();
     }
+}
 
-  
-  create_audio_elements ();
-    
-  while (announce_info_arr_.size ())
+void
+Performer_group_performer::do_announces ()
+{
+  while (1)
     {
+      performer_each (get_simple_trans_list (),
+                     &Performer::create_audio_elements);
+
+      if (!announce_infos_.size ())
+       break;
+
       acknowledge_audio_elements ();
-      announce_info_arr_.clear ();
-      create_audio_elements ();
+      announce_infos_.clear ();
+    }
+}
+
+void
+Performer_group_performer::play_element (Audio_element *e)
+{
+  Context *c = context_->get_parent_context ();
+  if (c)
+    {
+      Performer_group_performer *pgp = dynamic_cast<Performer_group_performer *> (c->implementation ());
+      pgp->play_element (e);
     }
+}
 
-  if (announce_info_arr_.size ())
+int
+Performer_group_performer::get_tempo () const
+{
+  Context *c = context_->get_parent_context ();
+  if (c)
     {
-#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_group_performer *pgp = dynamic_cast<Performer_group_performer *> (c->implementation ());
+      return pgp->get_tempo ();
     }
+  return 60;
 }
 
-Performer_group_performer::Performer_group_performer(){}