X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=55ff27d316aa5d453024fdda1f76c75c7007f26e;hb=7b298c01f32e7b5a06bdc143920b5bbb45d6014d;hp=33ca53a8ccd39c603c0e54c1cf48bfad91ec331d;hpb=a83aaeb059ad8cd747426dbf2d7eac845530ea12;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 33ca53a8cc..55ff27d316 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -18,75 +18,24 @@
 */
 
 #include "change-iterator.hh"
-#include "context.hh"
-#include "direction.hh"
-#include "international.hh"
-#include "music.hh"
-#include "music-wrapper-iterator.hh"
+#include "change-sequence-iterator.hh"
 
-class Auto_change_iterator : public Music_wrapper_iterator
+class Auto_change_iterator : public Change_sequence_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
+  Auto_change_iterator () {}
 
-  Auto_change_iterator ();
-
-protected:
-  virtual void construct_children ();
-  virtual void process (Moment);
 private:
-  SCM split_list_;
-  Direction where_dir_;
+  virtual void change_to (const string &id);
 };
 
 void
-Auto_change_iterator::process (Moment m)
+Auto_change_iterator::change_to (const string &id)
 {
-  // TODO: It seems strange that this occurs before consulting the split list.
-  Music_wrapper_iterator::process (m);
-
-  Moment *splitm = 0;
-
-  for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
-    {
-      splitm = unsmob<Moment> (scm_caar (split_list_));
-      if (*splitm > m)
-        break;
-
-      SCM tag = scm_cdar (split_list_);
-      Direction d = to_dir (tag);
-
-      if (d && d != where_dir_)
-        {
-          // TODO: The function of where_dir_ in choosing the direction should
-          // be built into split-list generation so that this iterator merely
-          // effects a sequence of context changes.
-          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);
-        }
-    }
-}
-
-Auto_change_iterator::Auto_change_iterator ()
-{
-  where_dir_ = CENTER;
-  split_list_ = SCM_EOL;
-}
-
-void
-Auto_change_iterator::construct_children ()
-{
-  split_list_ = get_music ()->get_property ("split-list");
-
-  Context *voice = get_outlet()->find_create_context (ly_symbol2scm ("Voice"),
-                                                      "", SCM_EOL);
-  set_context (voice);
-  Music_wrapper_iterator::construct_children ();
+  // 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"), id);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);