X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=cc262a85d16387a30c152581fd3bb78afee1d8ff;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=4b1336a80b3f8c2b2235c55737f25dd76ccbf00e;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 4b1336a80b..cc262a85d1 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--2014 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"
@@ -18,7 +29,6 @@ Simultaneous_music_iterator::Simultaneous_music_iterator ()
   children_list_ = SCM_EOL;
 }
 
-
 void
 Simultaneous_music_iterator::derived_mark () const
 {
@@ -29,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
@@ -40,59 +50,55 @@ Simultaneous_music_iterator::construct_children ()
   SCM i = get_music ()->get_property ("elements");
 
   children_list_ = SCM_EOL;
-  SCM * tail = &children_list_;
+  SCM *tail = &children_list_;
   for (; scm_is_pair (i); i = scm_cdr (i), j++)
     {
       Music *mus = unsmob_music (scm_car (i));
 
       SCM scm_iter = get_static_get_iterator (mus);
-      Music_iterator * mi = unsmob_iterator (scm_iter);
+      Music_iterator *mi = unsmob_iterator (scm_iter);
 
       /* if create_separate_contexts_ is set, create a new context with the
-	 number number as name */
+         number number as name */
 
-      SCM name = ly_symbol2scm (get_outlet ()->context_name ().to_str0 ());
-      Context * t = (j && create_separate_contexts_)
-	? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL)
-	: get_outlet ();
+      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 ()) 
-	{
-	  *tail = scm_cons (scm_iter, *tail);
-	  tail = SCM_CDRLOC (*tail);
-	}
+      if (mi->ok ())
+        {
+          *tail = scm_cons (scm_iter, *tail);
+          tail = SCM_CDRLOC (*tail);
+        }
       else
-	mi->set_context (0);
+        mi->quit ();
     }
 }
 
 void
 Simultaneous_music_iterator::process (Moment until)
 {
-  SCM *proc = &children_list_; 
+  SCM *proc = &children_list_;
   while (scm_is_pair (*proc))
     {
-      Music_iterator * i = unsmob_iterator (scm_car (*proc));
+      Music_iterator *i = unsmob_iterator (scm_car (*proc));
       if (i->run_always ()
-	  || i->pending_moment () == until) 
-	{
-	  i->process (until);
-	}
+          || i->pending_moment () == until)
+        i->process (until);
       if (!i->ok ())
-	{
-	  i->quit ();
-	  *proc = scm_cdr (*proc);
-	}
+        {
+          i->quit ();
+          *proc = scm_cdr (*proc);
+        }
       else
-	{
-	  proc = SCM_CDRLOC (*proc);
-	}
+        proc = SCM_CDRLOC (*proc);
     }
 }
 
@@ -101,27 +107,27 @@ Simultaneous_music_iterator::pending_moment () const
 {
   Moment next;
   next.set_infinite (1);
-  
+
   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 ();
+      Music_iterator *it = unsmob_iterator (scm_car (s));
+      next = min (next, it->pending_moment ());
     }
-  
+
   return next;
 }
 
 bool
 Simultaneous_music_iterator::ok () const
 {
-  bool run_always_ok = false; 
+  bool run_always_ok = false;
   for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music_iterator * it = unsmob_iterator (scm_car (s));
+      Music_iterator *it = unsmob_iterator (scm_car (s));
       if (!it->run_always ())
-	return true;
+        return true;
       else
-	run_always_ok =  run_always_ok || it->ok ();
+        run_always_ok = run_always_ok || it->ok ();
     }
   return run_always_ok;
 }
@@ -131,22 +137,13 @@ Simultaneous_music_iterator::run_always () const
 {
   for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
     {
-      Music_iterator * it = unsmob_iterator (scm_car (s));
+      Music_iterator *it = unsmob_iterator (scm_car (s));
       if (it->run_always ())
-	return true;
+        return true;
     }
   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 ()
 {