X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimultaneous-music-iterator.cc;h=a264d55ba9ab1174c80c4ce9001b4ea1c8687e83;hb=585959e4a373db9658d84ace8f3d4f4f6af7b190;hp=475e46a47da3944bd294e6f949f3be454db791d1;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index 475e46a47d..a264d55ba9 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--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "simultaneous-music-iterator.hh" @@ -50,7 +50,7 @@ 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 ()); + SCM name = ly_symbol2scm (get_outlet ()->context_name ().c_str ()); Context *t = (j && create_separate_contexts_) ? get_outlet ()->find_create_context (name, to_string (j), SCM_EOL) : get_outlet (); @@ -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 () {