release: 1.3.92

[lilypond.git] / lily / request-chord-iterator.cc

diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc
index 61e38b309492ed69953456fe794f635a9936e136..aaeeeecac7bcb5427fad13d5c56aa341d839d8e3 100644 (file)
--- a/lily/request-chord-iterator.cc
+++ b/lily/request-chord-iterator.cc
@@ -14,20 +14,28 @@
 
 Request_chord_iterator::Request_chord_iterator ()
 {
-  last_b_ = false;
 }
 
 Request_chord_iterator::Request_chord_iterator (Request_chord_iterator const &src)
-  : Music_iterator (src)
+  : Simple_music_iterator (src)
 {
-  last_b_ = src.last_b_;
-  elt_length_mom_ = src.elt_length_mom_;
+}
+
+Translator_group*
+Request_chord_iterator::get_req_translator_l ()
+{
+  assert (report_to_l ());
+  if (report_to_l ()->is_bottom_translator_b ())
+    return report_to_l ();
+
+  set_translator (report_to_l ()->get_default_interpreter ());
+  return report_to_l ();
 }
 
 void
 Request_chord_iterator::construct_children()
 {
-  elt_length_mom_ =elt_l ()->length_mom ();
+  Simple_music_iterator::construct_children ();
   get_req_translator_l();
 }
 
@@ -37,48 +45,32 @@ Request_chord_iterator::elt_l () const
   return (Request_chord*) music_l_;
 }
 
-bool
-Request_chord_iterator::ok() const
+SCM
+Request_chord_iterator::get_music (Moment) const
 {
-  return (elt_length_mom_ && !last_b_) || first_b_;
-}
-
-Moment
-Request_chord_iterator::next_moment() const
-{
-  Moment m (0);
-  if  (!first_b_)
-    m = elt_length_mom_;
-  return m;
-}
-
-
-void
-Request_chord_iterator::do_print() const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "duration: " << elt_length_mom_;
-#endif
-}
-
-bool
-Request_chord_iterator::next ()
-{
-  first_b_ = false;
-  //  last_b_ = true;
-  return ok ();
+  SCM s = SCM_EOL;
+  if (last_processed_mom_ < Moment (0))
+    {
+      Music_sequence * ms = dynamic_cast<Music_sequence*> (music_l_);
+     
+      for (SCM m = ms->music_list (); gh_pair_p (m); m = gh_cdr (m))
+       {
+         s = gh_cons (gh_car (m) , s);
+       }
+    }
+  return s;
 }
 
 void
-Request_chord_iterator::do_process_and_next (Moment mom)
+Request_chord_iterator::process (Moment m)
 {
-  // URG
-  //  if (ok ())
-  if (first_b_)
+  if (last_processed_mom_ < Moment (0))
     {
-      for (SCM s = dynamic_cast<Music_sequence *> (get_music ())->music_list (); gh_pair_p (s);  s = gh_cdr (s))
+      for (SCM s = dynamic_cast<Music_sequence *> (music_l_)->music_list ();
+          gh_pair_p (s);  s = gh_cdr (s))
        {
          Music *mus = unsmob_music (gh_car (s));
+
          if (Request * req_l = dynamic_cast<Request*> (mus))
            {
              bool gotcha = try_music (req_l);
@@ -87,13 +79,8 @@ Request_chord_iterator::do_process_and_next (Moment mom)
            }
          else
            mus->origin ()->warning (_f ("Huh?  Not a Request: `%s'",
-                                                classname (mus)));
-                   }
+                                        classname (mus)));
+       }
     }
-
-  next ();
-  // URG
-  if (mom >= elt_length_mom_)
-    last_b_ = true;
-
+  skip (m);
 }