Auto_change_iterator: move some state from C++ to Scheme

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

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 4a34540de96dfb6cc67735ed0a484f406ce13945..95784ec03b8cf26ee8c9bf254cd528a2c98afe8c 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -32,54 +32,35 @@ public:
   Auto_change_iterator ();
 
 protected:
-  virtual void do_quit ();
   virtual void construct_children ();
   virtual void process (Moment);
-  vector<Pitch> pending_pitch (Moment) const;
 private:
   SCM split_list_;
-  Direction where_dir_;
-  Moment start_moment_;
-
-  Context_handle up_;
-  Context_handle down_;
 };
 
 void
 Auto_change_iterator::process (Moment m)
 {
-  Music_wrapper_iterator::process (m);
-
-  Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
-  if (start_moment_.main_part_.is_infinity () && start_moment_ < 0)
-    start_moment_ = now;
 
   for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
     {
       splitm = unsmob<Moment> (scm_caar (split_list_));
-      if ((*splitm + start_moment_) > now)
+      if (*splitm > m)
         break;
 
-      SCM tag = scm_cdar (split_list_);
-      Direction d = to_dir (tag);
-
-      if (d && d != where_dir_)
-        {
-          where_dir_ = d;
-          string to_id = (d >= 0) ? "up" : "down";
-          // N.B. change_to() returns an error message. Silence is the legacy
-          // behavior here, but maybe that should be changed.
-          Change_iterator::change_to (*child_iter_,
-                                      ly_symbol2scm ("Staff"),
-                                      to_id);
-        }
+      // N.B. change_to() returns an error message. Silence is the legacy
+      // behavior here, but maybe that should be changed.
+      Change_iterator::change_to (*child_iter_,
+                                  ly_symbol2scm ("Staff"),
+                                  ly_scm2string (scm_cdar (split_list_)));
     }
+
+  Music_wrapper_iterator::process (m);
 }
 
 Auto_change_iterator::Auto_change_iterator ()
 {
-  where_dir_ = CENTER;
   split_list_ = SCM_EOL;
 }
 
@@ -87,30 +68,11 @@ void
 Auto_change_iterator::construct_children ()
 {
   split_list_ = get_music ()->get_property ("split-list");
-  start_moment_ = get_outlet ()->now_mom ();
-
-  SCM props = get_outlet ()->get_property ("trebleStaffProperties");
-  Context *up = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"),
-                                                    "up", props);
 
-  props = get_outlet ()->get_property ("bassStaffProperties");
-  Context *down = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"),
-                                                      "down", props);
-
-  up_.set_context (up);
-  down_.set_context (down);
-
-  Context *voice = up->find_create_context (ly_symbol2scm ("Voice"),
-                                            "", SCM_EOL);
+  Context *voice = get_outlet()->find_create_context (ly_symbol2scm ("Voice"),
+                                                      "", SCM_EOL);
   set_context (voice);
   Music_wrapper_iterator::construct_children ();
 }
 
-void
-Auto_change_iterator::do_quit ()
-{
-  up_.set_context (0);
-  down_.set_context (0);
-}
-
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);