X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=badc98d65bee38a0c1bec3648ccf87e629f52c17;hb=e34621159931fdbc7dff10973c2bc9ca38ab024c;hp=16691c3e63170de25d9dfb7a5d7cc6d56fb115f2;hpb=8a719f6eec1bd84269a55d1ec99adb3f17c04e64;p=lilypond.git

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index 16691c3e63..badc98d65b 100644
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "simultaneous-music-iterator.hh"
@@ -51,14 +51,14 @@ Simultaneous_music_iterator::construct_children ()
 	 number number as name */
 
       SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ());
-      Context *t = (j && create_separate_contexts_)
+      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 +133,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 ()
 {