X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frequest-chord-iterator.cc;h=65f3027077905d8787dea11b8b4e116de90866ba;hb=6b6a34e929bf1d5a8859fe77e66396c3c15ef37c;hp=47d28ce770484c69e928723bb0ba3b9ebb2b1148;hpb=ad4297de0246935caa4c51f4e152e20009a6f64e;p=lilypond.git

diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc
index 47d28ce770..65f3027077 100644
--- a/lily/request-chord-iterator.cc
+++ b/lily/request-chord-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
@@ -30,7 +30,6 @@ Request_chord_iterator::elt_l () const
 Request_chord_iterator::Request_chord_iterator ()
 {
   last_b_ = false;
-  //  cursor_ = elt_l ()->music_p_list_p_->head_;
   cursor_ = 0;
 }
 
@@ -50,30 +49,12 @@ Request_chord_iterator::next_moment() const
   return m;
 }
 
-Music*
-Request_chord_iterator::next_music_l ()
-{
-  if (first_b_)
-    {
-      cursor_ = elt_l ()->music_p_list_p_->head_;
-      first_b_ = false;
-    }
-  else
-    {
-      if (cursor_)
-	cursor_ = cursor_->next_;
-    }
-  if (cursor_)
-    return cursor_->car_;
-  else
-    return 0;
-}
 
 void
 Request_chord_iterator::do_print() const
 {
 #ifndef NPRINT
-  DOUT << "duration: " << elt_length_mom_;
+  DEBUG_OUT << "duration: " << elt_length_mom_;
 #endif
 }
 
@@ -86,12 +67,12 @@ Request_chord_iterator::do_process_and_next (Moment mom)
 	{
 	  if (Request * req_l = dynamic_cast<Request*> (i->car_))
 	    {
-	      bool gotcha = report_to_l()->try_music (req_l);
+	      bool gotcha = try_music (req_l);
 	      if (!gotcha)
-		req_l->warning (_f ("junking request: `%s\'", classname( req_l)));
+		req_l->warning (_f ("Junking request: `%s'", classname( req_l)));
 	    }
 	  else
-	    i->car_->warning (_f ("Huh? Not a Request: `%s\'",
+	    i->car_->warning (_f ("Huh?  Not a Request: `%s'",
 				   classname (i->car_)));
 	}
       first_b_ = false;