X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=95784ec03b8cf26ee8c9bf254cd528a2c98afe8c;hb=2609364accddd6b7b396932e91ce8f432b46a407;hp=76e43dbccdf4918175df9a7ef73b27f8bff736fb;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 76e43dbccd..95784ec03b 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--2011 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,6 +17,7 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "change-iterator.hh"
 #include "context.hh"
 #include "direction.hh"
 #include "international.hh"
@@ -31,104 +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_;
-  void change_to (Music_iterator *, SCM, string);
-  Moment start_moment_;
-
-  Context_handle up_;
-  Context_handle down_;
 };
 
-void
-Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
-				 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 = unsmob_moment (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);
-	}
+      splitm = unsmob<Moment> (scm_caar (split_list_));
+      if (*splitm > m)
+        break;
+
+      // 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;
 }
 
@@ -136,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);