X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=20f81b76aca9a490c87fbbd84293b367ca0973c1;hb=ace881437adc0146a62cffa3255ac1ca169bd054;hp=0c9cead8fe2005e3d7c7a0bfeea30f1181ca0152;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 0c9cead8fe..20f81b76ac 100644
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -1,9 +1,20 @@
 /*
-  simultaneous-music-iterator.cc -- implement Simultaneous_music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "simultaneous-music-iterator.hh"
@@ -28,7 +39,7 @@ void
 Simultaneous_music_iterator::derived_substitute (Context *f, Context *t)
 {
   for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
-    unsmob_iterator (scm_car (s))-> substitute_outlet (f, t);
+    unsmob_iterator (scm_car (s))->substitute_outlet (f, t);
 }
 
 void
@@ -50,15 +61,15 @@ Simultaneous_music_iterator::construct_children ()
       /* if create_separate_contexts_ is set, create a new context with the
 	 number number as name */
 
-      SCM name = ly_symbol2scm (get_outlet ()->context_name ().to_str0 ());
-      Context *t = (j && create_separate_contexts_)
+      SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ());
+      Context *c = (j && create_separate_contexts_)
 	? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL)
 	: get_outlet ();
 
-      if (!t)
-	t = get_outlet ();
+      if (!c)
+	c = get_outlet ();
 
-      mi->init_translator (mus, t);
+      mi->init_context (mus, c);
       mi->construct_children ();
 
       if (mi->ok ())
@@ -67,7 +78,7 @@ Simultaneous_music_iterator::construct_children ()
 	  tail = SCM_CDRLOC (*tail);
 	}
       else
-	mi->set_context (0);
+	mi->quit ();
     }
 }
 
@@ -80,18 +91,14 @@ Simultaneous_music_iterator::process (Moment until)
       Music_iterator *i = unsmob_iterator (scm_car (*proc));
       if (i->run_always ()
 	  || i->pending_moment () == until)
-	{
-	  i->process (until);
-	}
+	i->process (until);
       if (!i->ok ())
 	{
 	  i->quit ();
 	  *proc = scm_cdr (*proc);
 	}
       else
-	{
-	  proc = SCM_CDRLOC (*proc);
-	}
+	proc = SCM_CDRLOC (*proc);
     }
 }
 
@@ -104,7 +111,7 @@ Simultaneous_music_iterator::pending_moment () const
   for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
       Music_iterator *it = unsmob_iterator (scm_car (s));
-      next = next <? it->pending_moment ();
+      next = min (next, it->pending_moment ());
     }
 
   return next;
@@ -137,15 +144,6 @@ Simultaneous_music_iterator::run_always () const
   return false;
 }
 
-Music_iterator *
-Simultaneous_music_iterator::try_music_in_children (Music *m) const
-{
-  Music_iterator *b = 0;
-  for (SCM s = children_list_; !b && scm_is_pair (s); s = scm_cdr (s))
-    b = unsmob_iterator (scm_car (s))->try_music (m);
-  return b;
-}
-
 void
 Simultaneous_music_iterator::do_quit ()
 {