X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=d57960f9bba1ac799af0f34573f7bdd661864025;hb=9dd8f2b4e9efe7cd09bd5e2fa195dbc58b78f57f;hp=605363c488fcc022e57509dbd855aa1c8d873bec;hpb=f2f5eb23db6c2daf882957dcfe472657c8bdb1b6;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 605363c488..d57960f9bb 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "auto-change-music.hh"
+#include "music.hh"
 #include "auto-change-iterator.hh"
 #include "translator-group.hh"
-#include "musical-request.hh"
+#include "event.hh"
 
 
 
@@ -18,7 +18,7 @@ void
 Auto_change_iterator::change_to (Music_iterator *it, String to_type,
 				 String to_id)
 {
-  Translator_group * current = it->report_to_l ();
+  Translator_group * current = it->report_to ();
   Translator_group * last = 0;
 
   /*
@@ -31,13 +31,13 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
      
      If \translator Staff = bass, then look for Staff = *
    */
-  while  (current && current->type_str_ != to_type)
+  while (current && current->type_string_ != to_type)
     {
       last = current;
-      current = current->daddy_trans_l_;
+      current = current->daddy_trans_;
     }
 
-  if (current && current->id_str_ == to_id)
+  if (current && current->id_string_ == to_id)
     {
       String msg;
       msg += _ ("Can't switch translators, I'm there already");
@@ -47,9 +47,9 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
     if (last)
       {
 	Translator_group * dest = 
-	  it->report_to_l ()->find_create_translator_l (to_type, to_id);
-	current->remove_translator_p (last);
-	dest->add_group_translator (last);
+	  it->report_to ()->find_create_translator (to_type, to_id);
+	current->remove_translator (last);
+	dest->add_used_group_translator (last);
       }
     else
       {
@@ -57,7 +57,7 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
 	  We could change the current translator's id, but that would make 
 	  errors hard to catch
 	  
-	   last->translator_id_str_  = change_l ()->change_to_id_str_;
+	   last->translator_id_string_  = get_change ()->change_to_id_string_;
 	*/
 	//	error (_ ("I'm one myself"));
       }
@@ -75,33 +75,37 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
   will confuse the autochanger, since it will not notice that the
   music for OTHERSTAFF is not his.
 
-  PRECONDITION: this->ok() holds.
+  PRECONDITION: this->ok () holds.
 */
-Array<Musical_pitch>
+Array<Pitch>
 Auto_change_iterator::pending_pitch (Moment m) const
 {
-  Music_iterator * iter = child_iter_p_ ->clone ();
-  Array<Musical_pitch> ps;
+  Music_iterator * iter = child_iter_ ->clone ();
+  Array<Pitch> ps;
   while (1)
     {
-      SCM muses = iter->get_music (m);
-      for (SCM s = muses; gh_pair_p (s); s=gh_cdr (s))
-	if (Note_req* nr = dynamic_cast<Note_req*> (unsmob_music (gh_car (s))))
-	  {
-	    ps.push (nr->pitch_);
-	  }
-
+      SCM muses = iter->get_pending_events (m);
+      for (SCM s = muses; gh_pair_p (s); s=ly_cdr (s))
+	{
+	  Music * m = unsmob_music (ly_car (s));
+	  if (m && m->is_mus_type ("note-event"))
+	    {
+	      ps.push (*unsmob_pitch (m->get_mus_property ("pitch")));
+	    }
+	}
+      
       if (ps.size ())
 	break;
 
       iter->skip (m);
-      if (!iter->ok())
+      if (!iter->ok ())
 	break;
       
       m = iter->pending_moment ();
     }
 
-  delete iter;
+  scm_gc_unprotect_object (iter->self_scm());
+
   return ps;
 }
 
@@ -110,28 +114,35 @@ Auto_change_iterator::process (Moment m)
 {
   /*
     first we get the pitches, then we do the real work.
-    Music_wrapper_iterator::process() might process (and throw away)
+    Music_wrapper_iterator::process () might process (and throw away)
     pitches we need.  */
-  Array<Musical_pitch> ps = pending_pitch (m);
+  Array<Pitch> ps = pending_pitch (m);
 
   Music_wrapper_iterator::process (m);
   if (ps.size ())
     {
-      Musical_pitch p = ps[0];
-      Direction s = Direction (sign(p.steps ()));
-      if (s != where_dir_)
+      Pitch p = ps[0];
+      Direction s = Direction (sign (p.steps ()));
+      /*
+	Don't change for central C.
+
+	TODO: make this tunable somehow. Sometimes, you'd want to
+	switch for C.C. as well.
+
+      */
+      if (s && s != where_dir_)
 	{
 	  where_dir_ = s;
-	  String to_id =  (s >= 0) ?  "up" : "down";
-	  Auto_change_music const * auto_mus = dynamic_cast<Auto_change_music const* > (music_l_);
-
-	  String wh = ly_scm2string (auto_mus->get_mus_property ("what"));
-	  change_to (child_iter_p_, wh, to_id);	  
+	  String to_id = (s >= 0) ?  "up" : "down";
+	  String wh = ly_scm2string (get_music ()->get_mus_property ("what"));
+	  change_to (child_iter_, wh, to_id);	  
 	}
     }
 }
 
-Auto_change_iterator::Auto_change_iterator( )
+Auto_change_iterator::Auto_change_iterator ()
 {
   where_dir_ = CENTER;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);