source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "simultaneous-music-iterator.hh"
/* 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 ())
tail = SCM_CDRLOC (*tail);
}
else
- {
- mi->quit ();
- }
+ mi->quit ();
}
}
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);
}
}
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 ()
{