X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=55ff27d316aa5d453024fdda1f76c75c7007f26e;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=69b2d890bb7d48a829e6f3082c6cfd6faf05f7e7;hpb=7949941eb50f6243b76ded2dd331501027b68448;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 69b2d890bb..55ff27d316 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -1,129 +1,41 @@
-/*   
-  auto-change-iterator.cc -- implement  Auto_change_iterator
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include "music.hh"
-#include "context.hh"
-#include "event.hh"
-#include "music-wrapper-iterator.hh"
-#include "direction.hh"
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-class Auto_change_iterator : public Music_wrapper_iterator
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "change-iterator.hh"
+#include "change-sequence-iterator.hh"
+
+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);  
-  Array<Pitch> pending_pitch (Moment)const;
 private:
-  SCM split_list_;
-  Direction where_dir_;
-  void change_to (Music_iterator* , SCM, String);
-  Moment start_moment_;
+  virtual void change_to (const string &id);
 };
 
-
-
-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->daddy_context_;
-    }
-
-  if (current && current->id_string_ == to_id)
-    {
-      String msg;
-      msg += _ ("Can't switch translators, I'm there already");
-    }
-  
-  if (current) 
-    if (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
-      {
-	/*
-	  We could change the current translator's id, but that would make 
-	  errors hard to catch
-	  
-	*/
-      }
-  else
-    ;
-
-}
-
-void
-Auto_change_iterator::process (Moment m)
-{
-  Music_wrapper_iterator::process (m);
-  
-  Moment now = get_outlet ()->now_mom ();
-  Moment *splitm = 0;
-  
-  for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_))
-    {
-      splitm = unsmob_moment (gh_caar (split_list_));
-      if ((*splitm + start_moment_) > now)
-	break ;
-
-      *splitm += start_moment_;
-      SCM tag = gh_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 ()
+Auto_change_iterator::change_to (const string &id)
 {
-  Music_wrapper_iterator::construct_children ();
-  split_list_ =  get_music ()->get_property ("split-list");
-  start_moment_ = get_outlet ()->now_mom ();
+  // 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);