X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=55ff27d316aa5d453024fdda1f76c75c7007f26e;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=4559344fd8448d558a2ba9b895176ee290c57951;hpb=e8b68d8a878a0ee0381719230cf911dbcefa168d;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 4559344fd8..55ff27d316 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,149 +17,25 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "context.hh"
-#include "direction.hh"
-#include "international.hh"
-#include "music.hh"
-#include "music-wrapper-iterator.hh"
+#include "change-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 do_quit ();
-  virtual void construct_children ();
-  virtual void process (Moment);
-  vector<Pitch> pending_pitch (Moment) const;
 private:
-  SCM split_list_;
-  Direction where_dir_;
-  void change_to (Music_iterator *, SCM, const string&);
-  Moment start_moment_;
-
-  Context_handle up_;
-  Context_handle down_;
+  virtual void change_to (const string &id);
 };
 
 void
-Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
-                                 const string &to_id)
-{
-  Context *current = it->get_outlet ();
-  Context *last = 0;
-
-  /*
-    Cut & Paste from Change_iterator (ugh).
-
-    TODO: abstract this function
-  */
-
-  /* find the type  of translator that we're changing.
-
-  If \translator Staff = bass, then look for Staff = *
-  */
-  while (current && !current->is_alias (to_type_sym))
-    {
-      last = current;
-      current = current->get_parent_context ();
-    }
-
-  if (current && current->id_string () == to_id)
-    {
-      string msg;
-      msg += _f ("cannot change, already in translator: %s", to_id);
-    }
-
-  if (current)
-    {
-      if (last)
-        {
-          Context *dest
-            = it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL);
-
-          send_stream_event (last, "ChangeParent", get_music ()->origin (),
-                             ly_symbol2scm ("context"), dest->self_scm ());
-        }
-      else
-        {
-          /*
-            We could change the current translator's id, but that would make
-            errors hard to catch
-
-          */
-          ;
-        }
-    }
-}
-
-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 = Moment::unsmob (scm_caar (split_list_));
-      if ((*splitm + start_moment_) > now)
-        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";
-          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");
-  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);
-  set_context (voice);
-  Music_wrapper_iterator::construct_children ();
-}
-
-void
-Auto_change_iterator::do_quit ()
+Auto_change_iterator::change_to (const string &id)
 {
-  up_.set_context (0);
-  down_.set_context (0);
+  // 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);