release: 1.5.0

[lilypond.git] / lily / auto-change-iterator.cc

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 605363c488fcc022e57509dbd855aa1c8d873bec..2f29c4be38e47c49f43f0dc175ac84f6840b06b6 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 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"
@@ -31,7 +31,7 @@ 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_str_ != to_type)
     {
       last = current;
       current = current->daddy_trans_l_;
@@ -75,27 +75,27 @@ 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;
+  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_);
+           ps.push (*unsmob_pitch (nr->get_mus_property ("pitch")));
          }
 
       if (ps.size ())
        break;
 
       iter->skip (m);
-      if (!iter->ok())
+      if (!iter->ok ())
        break;
       
       m = iter->pending_moment ();
@@ -110,28 +110,28 @@ 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 ()));
+      Pitch p = ps[0];
+      Direction s = Direction (sign (p.steps ()));
       if (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"));
+         String to_id = (s >= 0) ?  "up" : "down";
+         String wh = ly_scm2string (music_l ()->get_mus_property ("what"));
          change_to (child_iter_p_, wh, to_id);   
        }
     }
 }
 
-Auto_change_iterator::Auto_change_iterator( )
+Auto_change_iterator::Auto_change_iterator ()
 {
   where_dir_ = CENTER;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);