Imported Upstream version 2.14.2

[lilypond.git] / lily / simultaneous-music-iterator.cc

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 33b5bc04728578be39b6bef05292c4228aa78bb5..3723c2695fe238ecf31a8d2f00e35df621e8d7e5 100644 (file)
--- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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"
@@ -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 ())
@@ -133,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 ()
 {