* lily/simple-spacer.cc (add_columns): use binary search for

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

diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index acbe2744e71657bf3452ed734ceb160bc1c57707..a4bfbfa92582203cecb46222fd7ba10cfc07be3c 100644 (file)
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -8,11 +8,11 @@
  */
 
 #include "performer-group-performer.hh"
+
 #include "context.hh"
 #include "audio-element.hh"
 #include "warn.hh"
 
-
 ENTER_DESCRIPTION (Performer_group_performer,
 /* descr */       "",
 /* creats*/       "",
@@ -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);
@@ -41,9 +41,9 @@ Performer_group_performer::acknowledge_audio_elements ()
     {
       Audio_element_info info = announce_infos_[j];
 
-      for (SCM p = get_simple_trans_list (); ly_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);
@@ -76,9 +76,9 @@ Performer_group_performer::Performer_group_performer ()
 void
 performer_each (SCM list, Performer_method method)
 {
-  for (SCM p = list; ly_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) ();
     }