X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsequential-music-iterator.cc;h=e8830fb7e4b0d2fda1e50c8f1981656a8bfe3913;hb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;hp=acaa17fc2b26efdd54d91991a2eab550edeeb9c5;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index acaa17fc2b..e8830fb7e4 100644
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -1,143 +1,20 @@
 /*
-  Sequential_music_iterator.cc -- implement Sequential_music_iterator
+  sequential-music-iterator.cc -- implement Sequential_music_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include "grace-iterator.hh"
-#include "translator-group.hh"
-#include "debug.hh"
-#include "sequential-music-iterator.hh"
-#include "music-list.hh"
-#include "request-chord-iterator.hh"
-
-
-void
-Sequential_music_iterator::do_print() const
-{
-  if (iter_p_)
-    iter_p_->print();
-}
 
-Sequential_music_iterator::Sequential_music_iterator ()
-{
-  cursor_ = 0;
-  here_mom_ = 0;
-  iter_p_ =0;
-}
-
-void
-Sequential_music_iterator::construct_children()
-{
-  cursor_ = dynamic_cast<Music_sequence const*> (music_l_)->music_p_list_p_->head_;
-  
-  while (cursor_)
-    {
-      start_next_element();
-      if (!iter_p_->ok()) 
-	{
-	  leave_element();
-	}
-      else 
-	{
-	  set_sequential_music_translator();
-	  break;
-	}
-    }
-}
-
-void 
-Sequential_music_iterator::leave_element()
-{
-  delete iter_p_;
-  iter_p_ =0;
-  Moment elt_time = cursor_->car_->length_mom ();
-  here_mom_ += elt_time;
-  cursor_ =cursor_->next_;
-}
-
-void
-Sequential_music_iterator::start_next_element()
-{
-  assert (!iter_p_);
-  iter_p_ = get_iterator_p (cursor_->car_);
-}
-
-void
-Sequential_music_iterator::set_sequential_music_translator()
-{
-  Translator_group  * child_report = child_report = iter_p_->report_to_l ();
-  if (dynamic_cast<Grace_iterator*> (iter_p_))
-    child_report = child_report->daddy_trans_l_;
-    
-  if (report_to_l()->depth_i () < child_report->depth_i ())
-    set_translator (child_report);
-}
-
-Sequential_music_iterator::~Sequential_music_iterator()
-{
-  if (iter_p_)
-    {
-      music_l_->warning (_ ("Must stop before this music ends"));
-      delete iter_p_;
-      iter_p_ = 0;
-    }
-}
-
-
-
-
-void
-Sequential_music_iterator::do_process_and_next (Moment until)
-{
-  if (!iter_p_)
-    return;
-
-  while (1) 
-    {
-      Moment local_until = until - here_mom_;
-      while (iter_p_->ok()) 
-	{
-	  Moment here = iter_p_->next_moment();
-	  if (here != local_until)
-	    goto loopexit;
-	    
-	  iter_p_->process_and_next (local_until);
-	}
-      
-      if (!iter_p_->ok()) 
-	{
-	  set_sequential_music_translator();
-	  leave_element();
-	  
-	  if (cursor_)
-	    start_next_element();
-	  else 
-	    goto loopexit;
-	}
-    }
-
-loopexit:
-
-  Music_iterator::do_process_and_next (until);
-}
-
-Moment
-Sequential_music_iterator::next_moment() const
-{
-  return iter_p_->next_moment() + here_mom_;
-}
+#include "context.hh"
+#include "sequential-music-iterator.hh"
+#include "music.hh"
+#include "warn.hh"
 
+IMPLEMENT_CTOR_CALLBACK (Sequential_music_iterator);
 
-bool
-Sequential_music_iterator::ok() const
+SCM
+Sequential_music_iterator::get_music_list ()const
 {
-  return iter_p_;
-}
-
-Music_iterator*
-Sequential_music_iterator::try_music_in_children (Music const *m) const
-{ 
-  return iter_p_ ? iter_p_->try_music (m) : 0;
+  return get_music ()->get_property ("elements");
 }