(c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "simultaneous-music-iterator.hh"
+
#include "context.hh"
#include "warn.hh"
-#include "simultaneous-music-iterator.hh"
#include "music-list.hh"
#include "context-def.hh"
-
Simultaneous_music_iterator::Simultaneous_music_iterator ()
{
create_separate_contexts_ = false;
void
Simultaneous_music_iterator::derived_substitute (Context *f,Context *t)
{
- for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
- unsmob_iterator (gh_car (s))-> substitute_outlet (f,t);
+ for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+ unsmob_iterator (scm_car (s))-> substitute_outlet (f,t);
}
void
children_list_ = SCM_EOL;
SCM * tail = &children_list_;
- for (; gh_pair_p (i); i = ly_cdr (i), j++)
+ for (; scm_is_pair (i); i = scm_cdr (i), j++)
{
- Music *mus = unsmob_music (ly_car (i));
+ Music *mus = unsmob_music (scm_car (i));
SCM scm_iter = get_static_get_iterator (mus);
Music_iterator * mi = unsmob_iterator (scm_iter);
/* if create_separate_contexts_ is set, create a new context with the
number number as name */
- SCM name = unsmob_context_def (get_outlet ()->definition_)->get_context_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 ();
tail = SCM_CDRLOC (*tail);
}
else
- mi->set_translator (0);
+ mi->set_context (0);
}
}
Simultaneous_music_iterator::process (Moment until)
{
SCM *proc = &children_list_;
- while (gh_pair_p (*proc))
+ while (scm_is_pair (*proc))
{
- Music_iterator * i = unsmob_iterator (gh_car (*proc));
+ Music_iterator * i = unsmob_iterator (scm_car (*proc));
if (i->run_always ()
|| i->pending_moment () == until)
{
if (!i->ok ())
{
i->quit ();
- *proc = gh_cdr (*proc);
+ *proc = scm_cdr (*proc);
}
else
{
- proc = SCM_CDRLOC(*proc);
+ proc = SCM_CDRLOC (*proc);
}
}
}
Moment next;
next.set_infinite (1);
- for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
+ for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
{
- Music_iterator * it = unsmob_iterator (gh_car (s));
+ Music_iterator * it = unsmob_iterator (scm_car (s));
next = next <? it->pending_moment ();
}
Simultaneous_music_iterator::ok () const
{
bool run_always_ok = false;
- for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
+ for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
{
- Music_iterator * it = unsmob_iterator (gh_car (s));
+ Music_iterator * it = unsmob_iterator (scm_car (s));
if (!it->run_always ())
return true;
else
bool
Simultaneous_music_iterator::run_always () const
{
- for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
+ for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
{
- Music_iterator * it = unsmob_iterator (gh_car (s));
+ Music_iterator * it = unsmob_iterator (scm_car (s));
if (it->run_always ())
return true;
}
Music_iterator*
Simultaneous_music_iterator::try_music_in_children (Music *m) const
{
- Music_iterator * b=0;
- for (SCM s = children_list_; !b && gh_pair_p (s); s = gh_cdr(s))
- b =unsmob_iterator (gh_car (s))->try_music (m);
+ 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 ()
{
- for (SCM s = children_list_; gh_pair_p (s); s = gh_cdr(s))
- unsmob_iterator (gh_car (s))->quit();
+ for (SCM s = children_list_; scm_is_pair (s); s = scm_cdr (s))
+ unsmob_iterator (scm_car (s))->quit ();
}
IMPLEMENT_CTOR_CALLBACK (Simultaneous_music_iterator);