(construct_children): add

[lilypond.git] / lily / auto-change-iterator.cc

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 30c7b69bbfe218d7ceda087597d8d29314af5049..852df8d28794a724ae3dd943fd5e236cf5170dc0 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -8,7 +8,7 @@
  */
 
 #include "music.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "event.hh"
 #include "music-wrapper-iterator.hh"
 #include "direction.hh"
@@ -16,7 +16,7 @@
 class Auto_change_iterator : public Music_wrapper_iterator
 {
 public:
-  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   
   Auto_change_iterator ();
 
@@ -28,6 +28,7 @@ private:
   SCM split_list_;
   Direction where_dir_;
   void change_to (Music_iterator* , SCM, String);
+  Moment start_moment_;
 };
 
 
@@ -36,8 +37,8 @@ void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
                                 String to_id)
 {
-  Translator_group * current = it->get_outlet ();
-  Translator_group * last = 0;
+  Context * current = it->get_outlet ();
+  Context * last = 0;
 
   /*
     Cut & Paste from Change_iterator (ugh).
@@ -52,7 +53,7 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   while (current && !current->is_alias (to_type_sym))
     {
       last = current;
-      current = current->daddy_trans_;
+      current = current->daddy_context_;
     }
 
   if (current && current->id_string_ == to_id)
@@ -64,10 +65,10 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   if (current) 
     if (last)
       {
-       Translator_group * dest = 
-         it->get_outlet ()->find_create_translator (to_type_sym, to_id, SCM_EOL);
-       current->remove_translator (last);
-       dest->add_used_group_translator (last);
+       Context * dest = 
+         it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL);
+       current->remove_context (last);
+       dest->add_context (last);
       }
     else
       {
@@ -86,7 +87,6 @@ void
 Auto_change_iterator::process (Moment m)
 {
   Music_wrapper_iterator::process (m);
-
   
   Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
@@ -94,7 +94,7 @@ Auto_change_iterator::process (Moment m)
   for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_))
     {
       splitm = unsmob_moment (gh_caar (split_list_));
-      if (*splitm > now)
+      if ((*splitm + start_moment_) > now)
        break ;
 
       SCM tag = gh_cdar (split_list_);
@@ -121,7 +121,8 @@ void
 Auto_change_iterator::construct_children ()
 {
   Music_wrapper_iterator::construct_children ();
-  split_list_ =  get_music ()->get_mus_property ("split-list");
+  split_list_ =  get_music ()->get_property ("split-list");
+  start_moment_ = get_outlet ()->now_mom ();
 }
 
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);